Fixed retrieval of invalid palette data in GetDIBits().

c011267b · Eric Kohl · Alexandre Julliard · 04e57f97 · c011267b
Commit c011267b authored Nov 15, 1998 by Eric Kohl Committed by Alexandre Julliard Nov 15, 1998
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 5 deletions

dib.c objects/dib.c +6 -5

No files found.
--- a/objects/dib.c
+++ b/objects/dib.c
@@ -461,12 +461,13 @@ INT32 WINAPI GetDIBits32(
        return 0;
    }

-      /* Transfer color info */
+    /* Transfer color info (FIXME) */
    
-    if (info->bmiHeader.biBitCount<=8) {
-	int colors = info->bmiHeader.biClrUsed;
-        if (!colors && (info->bmiHeader.biBitCount <= 8))
-            colors = 1 << info->bmiHeader.biBitCount;
+    if (info && (info->bmiHeader.biBitCount <= 8) &&
+        (bmp->bitmap.bmBitsPixel <= 8))
+    {
+        int colors = 1 << info->bmiHeader.biBitCount;
+	info->bmiHeader.biClrUsed = 0;
 	palEntry = palette->logpalette.palPalEntry;
 	for (i = 0; i < colors; i++, palEntry++)
 	{