Changeset 10513 for trunk/src/gdi32/blit.cpp

Timestamp:

Mar 12, 2004, 7:13:51 PM (21 years ago)

Author:

sandervl

Message:

SetDIBitsToDevice/StretchDIBits; set coloruse to DIB_RGB_COLORS for high (>=15) bpp bitmaps; GPI will crash with DIB_PAL_COLORS

File:

• trunk/src/gdi32/blit.cpp (modified) (4 diffs)

trunk/src/gdi32/blit.cpp

@@ -1 @@
-/* $Id: blit.cpp,v 1.49 2004-03-09 14:24:34 sandervl Exp $ */
+/* $Id: blit.cpp,v 1.50 2004-03-12 18:13:51 sandervl Exp $ */
 
 /*
@@ -184 +184 @@
     }
 
+    // GPI will crash when the app accidentally specifies PAL indexes with
+    // high bpp bitmap data
+    if(coloruse == DIB_PAL_COLORS && info->bmiHeader.biBitCount >= 15) {
+        dprintf(("WARNING: DIB_PAL_COLORS can't be used for high color bitmaps!!"));
+        coloruse = DIB_RGB_COLORS;
+    }
+
     if(bitfields[1] == 0x3E0) 
     {//RGB 555?
@@ -191 +198 @@
         pRGB555to565(newbits, (WORD *)bits, imgsize/sizeof(WORD));
         bits = newbits;
+        dprintf(("RGB 555->565 new bits %x", newbits));
     }
 
@@ -499 +507 @@
     }
 
+    // GPI will crash when the app accidentally specifies PAL indexes with
+    // high bpp bitmap data
+    if(wUsage == DIB_PAL_COLORS && info->bmiHeader.biBitCount >= 15) {
+        dprintf(("WARNING: DIB_PAL_COLORS can't be used for high color bitmaps!!"));
+        wUsage = DIB_RGB_COLORS;
+    }
+
     if(bitfields[1] == RGB555_GREEN_MASK) 
     {//RGB 555?