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

Timestamp:

Feb 6, 2003, 8:20:03 PM (23 years ago)

Author:

sandervl

Message:

Must manually correct y coordinates for DIB section blit since we reset the y inversion back to 0

File:

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

trunk/src/gdi32/dibsect.cpp

@@ -1 @@
-/* $Id: dibsect.cpp,v 1.63 2002-04-30 13:11:44 sandervl Exp $ */
+/* $Id: dibsect.cpp,v 1.64 2003-02-06 19:20:03 sandervl Exp $ */
 
 /*
@@ -392 +392 @@
   {
     pOS2bmp->argbColor[i].fcOptions = 0;
-#ifdef DEBUG_PALETTE
+#ifdef DEBUG
     dprintf2(("Index %d : 0x%08X\n",i, *((ULONG*)(&pOS2bmp->argbColor[i])) ));
 #endif
@@ -419 +419 @@
     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
   }
 
@@ -522 +525 @@
 #endif
 
+#ifdef INVERT
+  oldyinversion = GpiQueryYInversion(hps);
+  if(oldyinversion != 0) {
+        POINT viewpt, winpt;
+
+        GetViewportOrgEx(hps, &viewpt);
+        GetWindowOrgEx(hps, &winpt);
+
+        dprintf(("Viewport origin (%d,%d)", viewpt.x, viewpt.y));
+        dprintf(("Windows  origin (%d,%d)", winpt.x, winpt.y));
+        
+        /* By resetting y inversion to 0, we must take the new windows
+         * origin into account. The default matrix set up for the origin
+         * depends on y inversion. Therefor we must add the y origin value,
+         * multiplied by two, to the top & bottom coordinates 
+         */
+        point[0].y -= winpt.y*2;
+        point[1].y -= winpt.y*2;
+
+        /* By resetting y inversion to 0, we must take the new viewport
+         * origin into account. The default matrix set up for the origin
+         * depends on y inversion. Therefor we must subtract the y origin value,
+         * multiplied by two, from the top & bottom coordinates 
+         */
+        point[0].y -= viewpt.y*2;
+        point[1].y -= viewpt.y*2;
+
+        GpiEnableYInversion(hps, 0);
+        fRestoryYInversion = TRUE;
+  }
+#endif
+
   dprintf(("DIBSection::BitBlt (%d,%d)(%d,%d) from (%d,%d)(%d,%d) dim (%d,%d)(%d,%d)", point[0].x, point[0].y,
            point[1].x, point[1].y, point[2].x, point[2].y, point[3].x, point[3].y,
            nDestWidth, nDestHeight, nSrcWidth, nSrcHeight));
-
-#ifdef INVERT
-  oldyinversion = GpiQueryYInversion(hps);
-  if(oldyinversion != 0) {
-#ifdef DEBUG
-        POINT point;
-        GetViewportOrgEx(hps, &point);
-        dprintf(("Viewport origin (%d,%d)", point.x, point.y));
-#endif
-        GpiEnableYInversion(hps, 0);
-        fRestoryYInversion = TRUE;
-  }
-#endif
 
 #ifdef DEBUG