Changeset 20624

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

Location:

tags/trunk/src/gdi32

Files:

• dibitmap.cpp (modified) (4 diffs)
• dibsect.cpp (modified) (5 diffs)

tags/trunk/src/gdi32/dibitmap.cpp ¶

@@ -1 @@
-/* $Id: dibitmap.cpp,v 1.39 2003-02-06 20:28:09 sandervl Exp $ */
+/* $Id: dibitmap.cpp,v 1.40 2003-05-14 11:39:59 sandervl Exp $ */
 
 /*
@@ -366 +366 @@
     dprintf(("GDI32: GetDIBits %x %x %d %d %x %x (biBitCount %d) %d", hdc, hBitmap, uStartScan, cScanLines, lpvBits, lpbi, lpbi->bmiHeader.biBitCount, uUsage));
 
+#if 0
+    if(lpvBits && DIBSection::getSection() != NULL)
+    {
+        DIBSection *dsect;
+
+        dsect = DIBSection::findObj(hBitmap);
+        if(dsect) {
+             char *bmpBits = dsect->GetDIBObject();
+
+             if(lpbi->bmiHeader.biBitCount == dsect->GetBitCount() && 
+                lpbi->bmiHeader.biWidth > 0) 
+             {
+                 LONG lLineByte;
+
+                 dprintf(("Quick copy from DIB section memory"));
+                 lLineByte = DIB_GetDIBWidthBytes(lpbi->bmiHeader.biWidth, lpbi->bmiHeader.biBitCount);
+                 
+                 memcpy(lpvBits, bmpBits+(uStartScan*lLineByte), cScanLines*lLineByte);
+                 return cScanLines;
+             }
+        }
+    }
+#endif
+
     //SvL: WGSS screws up the DC if it's a memory DC
     //     TODO: Fix in WGSS (tries to select another bitmap in the DC which fails)
@@ -415 +439 @@
     }
     else {
+        LONG height = lpbi->bmiHeader.biHeight;
+
+        if(lpbi->bmiHeader.biHeight < 0) {
+            lpbi->bmiHeader.biHeight = -lpbi->bmiHeader.biHeight;
+        }
         nrlines = O32_GetDIBits(hdcMem, hBitmap, uStartScan, cScanLines, lpvBits, lpbi, uUsage);
+
+        //restore height
+        lpbi->bmiHeader.biHeight = height;
     }
 
@@ -470 +502 @@
     }
 
-    //WGSS/Open32 returns 0 when querying the bitmap info; must return nr of scanlines
-    //as 0 signals failure
+    //WGSS/Open32 returns 1 when querying the bitmap info; must return nr of scanlines
+    //(0 signals failure)
     if(lpvBits == NULL) {
-       nrlines = cScanLines;
+       if(nrlines != 0)
+            nrlines = cScanLines;
+       else dprintf(("GetDIBits failed!!"));
     }
     return nrlines;

tags/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
   }