mirror of
https://github.com/fltk/fltk.git
synced 2026-06-02 07:26:57 +08:00
Restore pixmap drawing under X11-noCairo broken by 0952d59
This commit is contained in:
@@ -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_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 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_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();
|
friend FL_EXPORT void gl_start();
|
||||||
/* ============== Implementation note about image drawing =========================
|
/* ============== Implementation note about image drawing =========================
|
||||||
A graphics driver can implement up to 6 virtual member functions to draw images:
|
A graphics driver can implement up to 6 virtual member functions to draw images:
|
||||||
|
|||||||
@@ -217,7 +217,7 @@ int fl_draw_pixmap(const char*const* cdata, int x, int y, Fl_Color bg) {
|
|||||||
} // for Y
|
} // 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;
|
delete[] buffer;
|
||||||
return 1;
|
return 1;
|
||||||
|
|||||||
Reference in New Issue
Block a user