Changeset 9558 for trunk/src

Timestamp:

Dec 28, 2002, 3:01:37 PM (23 years ago)

Author:

sandervl

Message:

SetDIBitsToDevice fix for inverted blitting

File:

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

trunk/src/gdi32/blit.cpp

@@ -1 @@
-/* $Id: blit.cpp,v 1.41 2002-11-26 10:53:06 sandervl Exp $ */
+/* $Id: blit.cpp,v 1.42 2002-12-28 14:01:37 sandervl Exp $ */
 
 /*
@@ -251 +251 @@
 
     //If upside down, reverse scanlines and call SetDIBitsToDevice again
-    if(info->bmiHeader.biHeight < 0 && info->bmiHeader.biBitCount != 8 && info->bmiHeader.biCompression == 0) {
+//    if(info->bmiHeader.biHeight < 0 && info->bmiHeader.biBitCount != 8 && info->bmiHeader.biCompression == 0) {
+    if(info->bmiHeader.biHeight < 0 && (info->bmiHeader.biCompression == BI_RGB ||
+       info->bmiHeader.biCompression == BI_BITFIELDS)) 
+    {
         // upside down
         INT rc = -1;
@@ -262 +265 @@
         char *newBits = (char *)malloc( lLineByte * lHeight );
         if(newBits) {
-            unsigned char *pbSrc = (unsigned char *)bits + lLineByte * (lHeight - 1);
+            unsigned char *pbSrc = (unsigned char *)bits + xSrc + lLineByte * (ySrc + lHeight - 1);
             unsigned char *pbDst = (unsigned char *)newBits;
             for(int y = 0; y < lHeight; y++) {
@@ -269 +272 @@
                 pbSrc -= lLineByte;
             }
-            rc = SetDIBitsToDevice( hdc, xDest, yDest, cx, cy, xSrc, ySrc, startscan, lines, (void *)newBits, &newInfo, coloruse );
+            //We only convert the necessary data so xSrc & ySrc are now 0
+            rc = SetDIBitsToDevice( hdc, xDest, yDest, cx, cy, 0, 0, startscan, lines, (void *)newBits, &newInfo, coloruse );
             free( newBits );
         }