diff options
| author | Manolo Gouy <Manolo> | 2018-04-18 14:41:54 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2018-04-18 14:41:54 +0000 |
| commit | 231e0edff6817b196abdd69b9c7539a213582d52 (patch) | |
| tree | f03a7b5a83c91217fe7f053298f4e256a1332496 /src | |
| parent | c79f82edd1c32308b4a2176b002975381b7478de (diff) | |
Fix crash in test/device after scale-GUI + Fl_Printer + Fl_Image_Surface
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12850 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
| -rw-r--r-- | src/drivers/GDI/Fl_GDI_Graphics_Driver_image.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/drivers/GDI/Fl_GDI_Graphics_Driver_image.cxx b/src/drivers/GDI/Fl_GDI_Graphics_Driver_image.cxx index 4ad9d5509..90ab6a13d 100644 --- a/src/drivers/GDI/Fl_GDI_Graphics_Driver_image.cxx +++ b/src/drivers/GDI/Fl_GDI_Graphics_Driver_image.cxx @@ -348,8 +348,10 @@ Fl_Bitmask Fl_GDI_Graphics_Driver::create_bitmask(int w, int h, const uchar *dat static uchar loNibble[16] = { 0x00, 0x08, 0x04, 0x0c, 0x02, 0x0a, 0x06, 0x0e, 0x01, 0x09, 0x05, 0x0d, 0x03, 0x0b, 0x07, 0x0f }; - int np = GetDeviceCaps(gc_, PLANES); //: was always one on sample machines - int bpp = GetDeviceCaps(gc_, BITSPIXEL);//: 1,4,8,16,24,32 and more odd stuff? + HDC hdc = GetDC(NULL); + int np = GetDeviceCaps(hdc, PLANES); //: was always one on sample machines + int bpp = GetDeviceCaps(hdc, BITSPIXEL);//: 1,4,8,16,24,32 and more odd stuff? + ReleaseDC(NULL, hdc); int Bpr = (bpp*w+7)/8; //: bytes per row int pad = Bpr&1, w1 = (w+7)/8, shr = ((w-1)&7)+1; if (bpp==4) shr = (shr+1)/2; |