diff options
| author | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2024-11-27 08:23:35 +0100 |
|---|---|---|
| committer | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2024-11-27 08:23:35 +0100 |
| commit | 3633b342fd8866aa5e5ba7bd257955b76b936af4 (patch) | |
| tree | fc9d0ae1ce86c9adc8c945b8755b066a94f88b4f | |
| parent | 95fc60bd8c90bbc5db9d47228d00f0aa0bcb4fa0 (diff) | |
Restore pixmap drawing under X11-noCairo broken by 0952d59
| -rw-r--r-- | FL/Fl_Graphics_Driver.H | 1 | ||||
| -rw-r--r-- | src/fl_draw_pixmap.cxx | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/FL/Fl_Graphics_Driver.H b/FL/Fl_Graphics_Driver.H index 16e15d90a..9bad68ac9 100644 --- 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 index 7670680ce..923186889 100644 --- 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; |