Changeset 10088 for trunk/src/gdi32/dibsect.cpp

Timestamp:

May 14, 2003, 1:39:59 PM (22 years ago)

Author:

sandervl

Message:

DIB section: do not fetch more colors from a bitmap header than biClrUsed (if ..= 0); GetDIBits: save and restore negative height & log failure

File:

• trunk/src/gdi32/dibsect.cpp (modified) (5 diffs)

trunk/src/gdi32/dibsect.cpp

@@ -1 @@
-/* $Id: dibsect.cpp,v 1.65 2003-04-01 15:57:05 sandervl Exp $ */
+/* $Id: dibsect.cpp,v 1.66 2003-05-14 11:39:59 sandervl Exp $ */
 
 /*
@@ -141 +141 @@
         dibinfo.dsBitfields[0] = dibinfo.dsBitfields[1] = dibinfo.dsBitfields[2] = 0;
         if(palsize) {
-            SetDIBColorTable(0, (1 << pbmi->biBitCount), (RGBQUAD *)(pbmi+1));
+            SetDIBColorTable(0, (pbmi->biClrUsed) ? pbmi->biClrUsed : (1 << pbmi->biBitCount), (RGBQUAD *)(pbmi+1));
         }
    }
@@ -350 +350 @@
    dprintf(("DIBSection::SetDIBits (%d,%d), %d %d", pbmi->biWidth, pbmi->biHeight, pbmi->biBitCount, pbmi->biCompression));
    if(palsize) {
-        SetDIBColorTable(0, 1 << pbmi->biBitCount, (RGBQUAD *)(pbmi+1));
+        SetDIBColorTable(0, (pbmi->biClrUsed) ? pbmi->biClrUsed : (1 << pbmi->biBitCount), (RGBQUAD *)(pbmi+1));
    }
 
@@ -393 +393 @@
   {
     pOS2bmp->argbColor[i].fcOptions = 0;
-#ifdef DEBUG
     dprintf2(("Index %d : 0x%08X\n",i, *((ULONG*)(&pOS2bmp->argbColor[i])) ));
-#endif
   }
   return(cEntries);
@@ -420 +418 @@
     pOS2bmp->argbColor[i].bGreen = palentry[i].peGreen;
     pOS2bmp->argbColor[i].bRed   = palentry[i].peRed;
-#ifdef DEBUG
     dprintf2(("Index %d : 0x%08X\n",i, *((ULONG*)(&pOS2bmp->argbColor[i])) ));
-#endif
   }