Changeset 10558 for trunk/src/gdi32/dibitmap.cpp

Timestamp:

Mar 24, 2004, 5:55:35 PM (21 years ago)

Author:

sandervl

Message:

CreateDIBitmap: added workaround for DIB_PAL_COLORS mode

File:

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

trunk/src/gdi32/dibitmap.cpp

@@ -1 @@
-/* $Id: dibitmap.cpp,v 1.42 2004-01-11 11:42:10 sandervl Exp $ */
+/* $Id: dibitmap.cpp,v 1.43 2004-03-24 16:55:35 sandervl Exp $ */
 
 /*
@@ -73 +73 @@
     }
 
+    //  For some reason, GPI messes up the colors in DIB_PAL_COLORS mode.
+    //  Work around it by converting palette indexes to RGB values
+    //  (SetDIBitsToDevice works under the same circumstances though)
+    if(fuUsage == DIB_PAL_COLORS && lpbmi->bmiHeader.biSize == sizeof(BITMAPINFOHEADER) &&
+       lpbmi->bmiHeader.biBitCount <= 8)
+    {
+        // workaround for open32 bug.
+        // If syscolors > 256 and wUsage == DIB_PAL_COLORS.
+
+        int i;
+        UINT biClrUsed;
+        USHORT *pColorIndex = (USHORT *)lpbmi->bmiColors;
+        RGBQUAD *pColors;
+        BITMAPINFO *infoLoc;
+
+        biClrUsed = (lpbmi->bmiHeader.biClrUsed) ? lpbmi->bmiHeader.biClrUsed : (1<<lpbmi->bmiHeader.biBitCount);
+
+        pColors = (RGBQUAD *) alloca(biClrUsed * sizeof(RGBQUAD));
+        infoLoc = (BITMAPINFO *) alloca(sizeof(BITMAPINFO) + biClrUsed * sizeof(RGBQUAD));
+
+        memcpy(infoLoc, lpbmi, sizeof(BITMAPINFO));
+
+        if(GetDIBColorTable(hdc, 0, biClrUsed, pColors) == 0) 
+        {
+            dprintf(("ERROR: StretchDIBits: GetDIBColorTable failed!!"));
+            return FALSE;
+        }
+        for(i=0;i<biClrUsed;i++, pColorIndex++)
+        {
+            infoLoc->bmiColors[i] = pColors[*pColorIndex];
+        }
+
+        rc = CreateDIBitmap(hdc, lpbmih, fdwInit, lpbInit, (PBITMAPINFO)infoLoc,
+                            DIB_RGB_COLORS);
+   
+        return rc;
+    }
+
     // 2000/09/01 PH Netscape 4.7
     // If color depth of lpbhmi is 16 bit and lpbmi is 8 bit,