Changeset 6692 for trunk/src

Timestamp:

Sep 10, 2001, 1:02:41 PM (24 years ago)

Author:

sandervl

Message:

DPtoLP & StretchDIBits fixes

Location:

trunk/src/gdi32

Files:

• blit.cpp (modified) (4 diffs)
• transform.cpp (modified) (2 diffs)

trunk/src/gdi32/blit.cpp

@@ -1 @@
-/* $Id: blit.cpp,v 1.33 2001-07-13 19:34:21 sandervl Exp $ */
+/* $Id: blit.cpp,v 1.34 2001-09-10 11:02:40 sandervl Exp $ */
 
 /*
@@ -376 +376 @@
 {
  INT rc;
- DWORD bitfields[3];
+ DWORD bitfields[3], compression = 0;
  WORD *newbits = NULL;
 
@@ -466 +466 @@
         bits = newbits;
     }
+    //SvL: Ignore BI_BITFIELDS type (SetDIBitsToDevice fails otherwise)
+    if(info->bmiHeader.biCompression == BI_BITFIELDS) {
+        ((BITMAPINFO *)info)->bmiHeader.biCompression = 0;
+        compression = BI_BITFIELDS;
+
+    }
 
     rc = O32_StretchDIBits(hdc, xDst, yDst, widthDst, heightDst, xSrc, ySrc,
@@ -471 +477 @@
                              (PBITMAPINFO)info, wUsage, dwRop);
 
+    if(compression == BI_BITFIELDS) {
+        ((BITMAPINFO *)info)->bmiHeader.biCompression = BI_BITFIELDS;
+    }
     if(newbits) free(newbits);
 

trunk/src/gdi32/transform.cpp

@@ -1 @@
-/* $Id: transform.cpp,v 1.6 2001-07-30 12:00:38 sandervl Exp $ */
+/* $Id: transform.cpp,v 1.7 2001-09-10 11:02:41 sandervl Exp $ */
 
 /*
@@ -68 +68 @@
 {
     BOOL ret;
-    DWORD hdcwidth, hdcheight;
+    LONG hdcwidth, hdcheight;
     pDCData pHps;