Changeset 3371 for trunk/src

Timestamp:

Apr 13, 2000, 8:47:16 PM (25 years ago)

Author:

sandervl

Message:

dibsection change

File:

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

trunk/src/gdi32/dibsect.cpp

@@ -1 @@
-/* $Id: dibsect.cpp,v 1.26 2000-04-09 11:10:34 sandervl Exp $ */
+/* $Id: dibsect.cpp,v 1.27 2000-04-13 18:47:16 sandervl Exp $ */
 
 /*
@@ -384 +384 @@
  PVOID  bitmapBits = NULL;
  int    oldyinversion = 0;
-
-#if 0
+ BOOL   fRestoryYInversion = FALSE;
+
+#if 1
   HWND hwndDest = WindowFromDC(hdcDest);
   hwndDest = Win32ToOS2Handle(hwndDest);
@@ -399 +400 @@
 #endif
 
+  if(nDestWidth == 160 && nDestHeight == 120) {
+        nSrcWidth = 160;
+  }
+
   dprintf(("DIBSection::BitBlt %x %X (hps %x) %x to(%d,%d)(%d,%d) from (%d,%d)(%d,%d) rop %x flip %x",
-//          handle, hdcDest, hps, hwndDest, nXdest, nYdest, nDestWidth, nDestHeight,
-          handle, hdcDest, hps, 0, nXdest, nYdest, nDestWidth, nDestHeight,
+          handle, hdcDest, hps, hwndDest, nXdest, nYdest, nDestWidth, nDestHeight,
+//          handle, hdcDest, hps, 0, nXdest, nYdest, nDestWidth, nDestHeight,
           nXsrc, nYsrc, nSrcWidth, nSrcHeight, Rop, fFlip));
 
@@ -428 +433 @@
   if(fFlip & FLIP_VERT)
   {
-        GpiEnableYInversion(hps, pOS2bmp->cy-1);
-  }
-  else  GpiEnableYInversion(hps, 0);
+        if(oldyinversion != pOS2bmp->cy-1) {
+                GpiEnableYInversion(hps, pOS2bmp->cy-1);
+                fRestoryYInversion = TRUE;
+        }
+  }
+  else  
+  if(oldyinversion != 0) {
+        GpiEnableYInversion(hps, 0);
+        fRestoryYInversion = TRUE;
+  }
 
   if(fFlip & FLIP_HOR)
@@ -442 +454 @@
   //SvL: Optimize this.. (don't convert entire bitmap if only a part will be blitted to the dc)
   if(dibinfo.dsBitfields[1] == 0x3E0) {//RGB 555?
-        dprintf(("DIBSection::BitBlt; convert rgb 555 to 565"));
+        dprintf(("DIBSection::BitBlt; convert rgb 555 to 565 (old y inv. = %d", oldyinversion));
 
         if(bmpBitsRGB565 == NULL)
@@ -471 +483 @@
         }
         //restore old y inversion height
-        GpiEnableYInversion(hps, oldyinversion);
-//      if(hwndDest != 0)
-//      {
-//              WinReleasePS(hps);
-//      }
+        if(fRestoryYInversion) GpiEnableYInversion(hps, oldyinversion);
+#if 1
+        if(hwndDest != 0)
+        {
+                WinReleasePS(hps);
+        }
+#endif
         return(TRUE);
   }
-  GpiEnableYInversion(hps, oldyinversion);
-//  if(hwndDest != 0)
-//  {
-//      WinReleasePS(hps);
-//  }
+  if(fRestoryYInversion) GpiEnableYInversion(hps, oldyinversion);
+#if 1
+  if(hwndDest != 0)
+  {
+        WinReleasePS(hps);
+  }
+#endif
   dprintf(("DIBSection::BitBlt %X (%d,%d) (%d,%d) to (%d,%d) (%d,%d) returned %d\n", hps, point[0].x, point[0].y, point[1].x, point[1].y, point[2].x, point[2].y, point[3].x, point[3].y, rc));
-//  dprintf(("WinGetLastError returned %X\n", WinGetLastError(WinQueryAnchorBlock(hwndDest)) & 0xFFFF));
+#if 1
+  dprintf(("WinGetLastError returned %X\n", WinGetLastError(WinQueryAnchorBlock(hwndDest)) & 0xFFFF));
+#endif
   return(FALSE);
 }