Swap to internal C++ logging.h

Along with some other minor merge / C++ fixes.`
brndnmtthws · Feb 26, 2024 · e169536 · e169536
1 parent 37cb6aa
commit e169536
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 48 deletions.
diff --git a/lua/CMakeLists.txt b/lua/CMakeLists.txt
@@ -44,7 +44,7 @@ if(BUILD_X11)
   endif(BUILD_LUA_CAIRO)
 
   if(BUILD_LUA_IMLIB2)
-    include_directories(${luaimlib2_includes} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
+    include_directories(${luaimlib2_includes} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ../src)
 
     if(IMLIB2_VERSION VERSION_GREATER_EQUAL "1.10.0")
       wrap_tolua(luaimlib2_src imlib2.pkg)

diff --git a/lua/libcairo_imlib2_helper.h b/lua/libcairo_imlib2_helper.h
@@ -46,7 +46,7 @@ void cairo_place_image(const char *file, cairo_t *cr, int x, int y,
     return;
   }
 
-  image = imlib_load_image(file);
+  image = (Imlib_Image *)imlib_load_image(file);
   if (!image) {
     NORM_ERR("cairoimagehelper: Couldn't load %s\n", file);
     return;
@@ -62,7 +62,7 @@ void cairo_place_image(const char *file, cairo_t *cr, int x, int y,
   }
 
   /* create scaled version of image to later extract the alpha channel */
-  alpha_image = imlib_create_cropped_scaled_image   (0, 0, w, h, width, height);
+  alpha_image = imlib_create_cropped_scaled_image(0, 0, w, h, width, height);
 
   /* create temporary image */
   premul = imlib_create_image(width, height);
@@ -88,7 +88,7 @@ void cairo_place_image(const char *file, cairo_t *cr, int x, int y,
   /* now pass the result to cairo */
   result = cairo_image_surface_create_for_data(
       (unsigned char  *)imlib_image_get_data_for_reading_only(), CAIRO_FORMAT_ARGB32,
-      scaled_w, scaled_h, sizeof(DATA32) * scaled_w);
+      width, height, stride);
 
   cairo_set_source_surface(cr, result, x, y);
   cairo_paint_with_alpha(cr, alpha);
@@ -124,7 +124,7 @@ void cairo_draw_image(const char *file, cairo_surface_t *cs, int x, int y,
     return;
   }
 
-  Imlib_Image *image = imlib_load_image(file);
+  Imlib_Image *image = (Imlib_Image *)imlib_load_image(file);
   if (!image) {
     NORM_ERR("cairoimagehelper: Couldn't load %s\n", file);
     return;
@@ -151,7 +151,6 @@ void cairo_draw_image(const char *file, cairo_surface_t *cs, int x, int y,
   cairo_place_image(file, cr, x, y, scaled_w, scaled_h, 1.0);
 
   cairo_destroy(cr);
-  cairo_surface_destroy(result);
 }
 
 #endif /* _LIBCAIRO_IMAGE_HELPER_H_ */
diff --git a/lua/logging.h b/lua/logging.h