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

Timestamp:

Oct 1, 2000, 11:16:17 PM (25 years ago)

Author:

phaller

Message:

Fix for uncompressed/RGB bitmaps with biSizeImage == 0

File:

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

trunk/src/gdi32/dibsect.cpp

@@ -1 @@
-/* $Id: dibsect.cpp,v 1.38 2000-08-30 18:05:24 sandervl Exp $ */
+/* $Id: dibsect.cpp,v 1.39 2000-10-01 21:16:17 phaller Exp $ */
 
 /*
@@ -525 +525 @@
         if(bmpBitsDblBuffer == NULL)
                 DebugInt3();
-
-        if(CPUFeatures & CPUID_MMX) {
-                RGB555to565MMX((WORD *)bmpBitsDblBuffer, (WORD *)bitmapBits, pOS2bmp->cbImage/sizeof(WORD));
-        }
-        else    RGB555to565((WORD *)bmpBitsDblBuffer, (WORD *)bitmapBits, pOS2bmp->cbImage/sizeof(WORD));
-        rc = GpiDrawBits(hps, bmpBitsDblBuffer, pOS2bmp, 4, &point[0], ROP_SRCCOPY, os2mode);
+    
+    // PH 2000/10/01 - Fix for Beyond Compare 1.9d
+    // Note: according to documentation, cmImage can be zero for
+    // RGB- / non-compressed bitmaps.
+    int iLength = pOS2bmp->cbImage;
+    if (iLength == 0)
+      iLength = pOS2bmp->cx * pOS2bmp->cy * (pOS2bmp->cBitCount >> 3);
+      
+    if (iLength > 0)
+    {
+      if(CPUFeatures & CPUID_MMX) 
+        RGB555to565MMX((WORD *)bmpBitsDblBuffer, (WORD *)bitmapBits, iLength/sizeof(WORD));
+      else      
+        RGB555to565((WORD *)bmpBitsDblBuffer, (WORD *)bitmapBits, iLength/sizeof(WORD));
+    }
+    else
+    {
+      dprintf(("GDI32: DIBSect::BitBlt: WARNING! zero-length bitmap! %08xh",
+               pOS2bmp));
+    }
+
+
+    rc = GpiDrawBits(hps, bmpBitsDblBuffer, pOS2bmp, 4, &point[0], ROP_SRCCOPY, os2mode);
   }
   else  rc = GpiDrawBits(hps, bitmapBits, pOS2bmp, 4, &point[0], ROP_SRCCOPY, os2mode);