Changeset 7662 for trunk/src

Timestamp:

Dec 20, 2001, 8:57:01 PM (24 years ago)

Author:

sandervl

Message:

DIB Section blit: don't check source & destination sizes with DC size (GpiDrawBits does that for us)

File:

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

trunk/src/gdi32/dibsect.cpp

@@ -1 @@
-/* $Id: dibsect.cpp,v 1.60 2001-11-16 15:50:59 phaller Exp $ */
+/* $Id: dibsect.cpp,v 1.61 2001-12-20 19:57:01 sandervl Exp $ */
 
 /*
@@ -495 +495 @@
   }
 
+  //Don't clip destination size to destination DC size
+  //This messes up the two bitmaps in the opening window of Opera 6
+  //(choice between MDI & SDI interface)
+#if 0
+  if(nXdest + nDestWidth > hdcWidth) {
+        nDestWidth  = hdcWidth - nXdest;
+  }
+
+  if(nYdest + nDestHeight > hdcHeight) {
+        nDestHeight = hdcHeight - nYdest;
+  }
+#endif
+
   //win32 coordinates are relative to left top, OS/2 expects left bottom
   //source rectangle is non-inclusive (top, right not included)
   //destination rectangle is incl.-inclusive (everything included)
-
-  if(nXdest + nDestWidth > hdcWidth) {
-        nDestWidth  = hdcWidth - nXdest;
-  }
-
-  if(nYdest + nDestHeight > hdcHeight) {
-        nDestHeight = hdcHeight - nYdest;
-  }
 
   point[0].x = nXdest;
@@ -512 +517 @@
   point[1].y = hdcHeight - nYdest - 1;
 
-  //target rectangle is inclusive-inclusive
+#if 0
+  //Don't check size here either. Let GpiDrawBits do that for us
   if(nXsrc + nSrcWidth > pOS2bmp->cx) {
         nSrcWidth  = pOS2bmp->cx - nXsrc;
@@ -519 +525 @@
         nSrcHeight = pOS2bmp->cy - nYsrc;
   }
+#endif
+
+  //target rectangle is inclusive-inclusive
   point[2].x = nXsrc;
   point[2].y = pOS2bmp->cy - nYsrc - nSrcHeight;