From 09697c47385b2b4749f41e2862b0e93eb9933092 Mon Sep 17 00:00:00 2001 From: Matthias Melcher Date: Fri, 25 Nov 2022 10:52:46 +0100 Subject: Fix GDI graphics driver use for bitmasks --- src/drivers/GDI/Fl_GDI_Graphics_Driver_image.cxx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/drivers/GDI/Fl_GDI_Graphics_Driver_image.cxx b/src/drivers/GDI/Fl_GDI_Graphics_Driver_image.cxx index 9e512d889..d3e23be9f 100644 --- a/src/drivers/GDI/Fl_GDI_Graphics_Driver_image.cxx +++ b/src/drivers/GDI/Fl_GDI_Graphics_Driver_image.cxx @@ -803,7 +803,11 @@ void Fl_GDI_Graphics_Driver::cache(Fl_Pixmap *img) { fl_draw_pixmap(img->data(), 0, 0, FL_BLACK); uchar *bitmap = *pbitmap; if (bitmap) { - *Fl_Graphics_Driver::mask(img) = (fl_uintptr_t)create_bitmask(img->data_w(), img->data_h(), bitmap); + // Note: activating the surface device changes graphics drivers. + // Don't use 'this', but the new driver instead. + *Fl_Graphics_Driver::mask(img) = + (fl_uintptr_t)((Fl_GDI_Graphics_Driver *)fl_graphics_driver)-> + create_bitmask(img->data_w(), img->data_h(), bitmap); delete[] bitmap; } *pbitmap = 0; -- cgit v1.2.3