Changeset 9359 for trunk/src

Timestamp:

Oct 28, 2002, 2:24:44 PM (23 years ago)

Author:

sandervl

Message:

Workaround added for WGSS GetDIBits bug

File:

• trunk/src/gdi32/dibitmap.cpp (modified) (3 diffs)

trunk/src/gdi32/dibitmap.cpp

@@ -1 @@
-/* $Id: dibitmap.cpp,v 1.33 2002-07-15 11:19:51 sandervl Exp $ */
+/* $Id: dibitmap.cpp,v 1.34 2002-10-28 13:24:44 sandervl Exp $ */
 
 /*
@@ -373 +373 @@
                        void *lpvBits, PBITMAPINFO lpbi, UINT uUsage)
 {
- int nrlines;
+    int nrlines;
 
     dprintf(("GDI32: GetDIBits %x %x %d %d %x %x (biBitCount %d) %d", hdc, hBitmap, uStartScan, cScanLines, lpvBits, lpbi, lpbi->bmiHeader.biBitCount, uUsage));
@@ -381 +381 @@
     HDC hdcMem = CreateCompatibleDC(0);
 
-    nrlines = O32_GetDIBits(hdcMem, hBitmap, uStartScan, cScanLines, lpvBits, lpbi, uUsage);
+    if(lpbi->bmiHeader.biHeight < 0) {
+        //NOTE: workaround for WGSS bug; remove when fixed
+        LONG height = lpbi->bmiHeader.biHeight;
+
+        nrlines = O32_GetDIBits(hdcMem, hBitmap, uStartScan, cScanLines, lpvBits, lpbi, uUsage);
+
+        //NOTE: workaround for WGSS bug; remove when fixed
+        lpbi->bmiHeader.biHeight = height;
+    }
+    else {
+        nrlines = O32_GetDIBits(hdcMem, hBitmap, uStartScan, cScanLines, lpvBits, lpbi, uUsage);
+    }
 
     DeleteDC(hdcMem);