Restore pixmap drawing under X11-noCairo broken by 0952d59

age-rs · Nov 27, 2024 · 3633b34 · 3633b34
1 parent 95fc60b
commit 3633b34
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/FL/Fl_Graphics_Driver.H b/FL/Fl_Graphics_Driver.H
@@ -90,6 +90,7 @@ class FL_EXPORT Fl_Graphics_Driver {
   friend void fl_draw_image(Fl_Draw_Image_Cb cb, void* data, int X,int Y,int W,int H, int D);
   friend void fl_copy_offscreen(int x, int y, int w, int h, Fl_Offscreen pixmap, int srcx, int srcy);
   friend int fl_convert_pixmap(const char*const* cdata, uchar* out, Fl_Color bg);
+  friend int fl_draw_pixmap(const char*const* cdata, int x, int y, Fl_Color bg);
   friend FL_EXPORT void gl_start();
   /* ============== Implementation note about image drawing =========================
    A graphics driver can implement up to 6 virtual member functions to draw images:

diff --git a/src/fl_draw_pixmap.cxx b/src/fl_draw_pixmap.cxx
@@ -217,7 +217,7 @@ int fl_draw_pixmap(const char*const* cdata, int x, int y, Fl_Color bg) {
     } // for Y
   }
 
-  fl_draw_image(buffer, x, y, w, h, 4 | FL_IMAGE_WITH_ALPHA);
+  fl_graphics_driver->draw_image(buffer, x, y, w, h, 4);
 
   delete[] buffer;
   return 1;