Changeset 4254 for trunk/src/gdi32/blit.cpp

Timestamp:

Sep 13, 2000, 11:00:22 PM (25 years ago)

Author:

sandervl

Message:

StretchDIBits fix (wrong value returned by Open32)

File:

• trunk/src/gdi32/blit.cpp (modified) (3 diffs)

trunk/src/gdi32/blit.cpp

@@ -1 @@
-/* $Id: blit.cpp,v 1.17 2000-08-30 18:05:24 sandervl Exp $ */
+/* $Id: blit.cpp,v 1.18 2000-09-13 21:00:22 sandervl Exp $ */
 
 /*
@@ -256 +256 @@
                                (PBITMAPINFO)infoLoc, DIB_RGB_COLORS, dwRop);
 
-        if(rc != heightSrc) {
+        //Open32 always returns height of bitmap (regardless of how many scanlines were copied)
+        if(rc != heightSrc && rc != infoLoc->bmiHeader.biHeight) {
                 dprintf(("StretchDIBits failed with rc %x", rc));
         }
         else {
+                rc = heightSrc;
+
                 DIBSection *destdib = DIBSection::findHDC(hdc);
                 if(destdib) {
@@ -277 +280 @@
                              widthSrc, heightSrc, (void *)bits,
                              (PBITMAPINFO)info, wUsage, dwRop);
-    if(rc != heightSrc) {
+    //Open32 always returns height of bitmap (regardless of how many scanlines were copied)
+    if(rc != heightSrc && rc != info->bmiHeader.biHeight) {
         dprintf(("StretchDIBits failed with rc %x", rc));
     }
-    else {
+    else 
+    {
+        rc = heightSrc;
+
         DIBSection *destdib = DIBSection::findHDC(hdc);
         if(destdib) {