commit c011267b972fbe4381cdfd09b7192e374eb1e6eb
author Eric Kohl <ekohl@abo.rhein-zeitung.de> Sun Nov 15 18:10:11 1998 +0000
committer Alexandre Julliard <julliard@winehq.org> Sun Nov 15 18:10:11 1998 +0000
tree f97c693486e6c9d676dcc87897a5f63e12cf6ab6
parent 04e57f97fcc7d847fd8559cf64edf6fd2d2d1581

Fixed retrieval of invalid palette data in GetDIBits().

objects/dib.c

diff --git a/objects/dib.c b/objects/dib.c
index 2409750..82226fb 100644
--- a/objects/dib.c
+++ b/objects/dib.c
@@ -461,12 +461,13 @@
         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++)
 	{