Changeset 6794 for trunk/src

Timestamp:

Sep 23, 2001, 10:14:08 PM (24 years ago)

Author:

sandervl

Message:

fix for GpiQueryBitmapBits failure (cbImage too small for compressed images)

File:

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

trunk/src/gdi32/dibsect.cpp

@@ -1 @@
-/* $Id: dibsect.cpp,v 1.56 2001-08-18 03:49:24 phaller Exp $ */
+/* $Id: dibsect.cpp,v 1.57 2001-09-23 20:14:08 sandervl Exp $ */
 
 /*
@@ -192 +192 @@
      dprintf2(("Increment section starting at %08X\n",dsect));
 
-     /* @@@PH 98/07/11 fix for dsect->next == NULL */
      while ( (dsect->next != this) &&
              (dsect->next != NULL) )
@@ -671 +670 @@
         destBuf = bmpBitsDblBuffer + nYdest*dibinfo.dsBm.bmWidthBytes;
 
+        //SvL: cbImage can be too small for compressed images; GpiQueryBitmapBits
+        //     will fail in that case (CoolEdit 2000). Perhaps because the returned
+        //     compressed image is larger than the original.
+        //     Use uncompressed size instead
+        //     NOTE: The correct size will be returned by GpiQueryBitmapBits
+        tmphdr->cbImage = dibinfo.dsBm.bmHeight*dibinfo.dsBm.bmWidthBytes;
+
         rc = GpiQueryBitmapBits(hdc, nYdest, nDestHeight, destBuf,
                                 tmphdr);
@@ -683 +689 @@
   }
   else {
+        //SvL: cbImage can be too small for compressed images; GpiQueryBitmapBits
+        //     will fail in that case (CoolEdit 2000). Perhaps because the returned
+        //     compressed image is larger than the original.
+        //     Use uncompressed size instead
+        //     NOTE: The correct size will be returned by GpiQueryBitmapBits
+        tmphdr->cbImage = dibinfo.dsBm.bmHeight*dibinfo.dsBm.bmWidthBytes;
+
         destBuf = GetDIBObject() + nYdest*dibinfo.dsBm.bmWidthBytes;
         rc = GpiQueryBitmapBits(hdc, nYdest, nDestHeight, destBuf,
                                 tmphdr);
 
+        if(rc) {
+            dprintf(("ERROR: GpiQueryBitmapBits failed with %x", WinGetLastError(0)));
+        }
 #ifdef DEBUG_PALETTE
         if(rc != GPI_ALTERROR && tmphdr->cBitCount <= 8) {