Changeset 9576 for trunk/src/gdi32/blit.cpp

Timestamp:

Jan 1, 2003, 5:32:07 PM (23 years ago)

Author:

sandervl

Message:

Cleaned up SetDIBitsToDevice

File:

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

trunk/src/gdi32/blit.cpp

@@ -1 @@
-/* $Id: blit.cpp,v 1.42 2002-12-28 14:01:37 sandervl Exp $ */
+/* $Id: blit.cpp,v 1.43 2003-01-01 16:32:07 sandervl Exp $ */
 
 /*
@@ -15 +15 @@
 #include <string.h>
 #include <cpuhlp.h>
-#include "misc.h"
+#include <winuser32.h>
+#include <dbglog.h>
 #include "dibsect.h"
 #include "rgbcvt.h"
@@ -250 +251 @@
     char *newBits = NULL;
 
+    if(startscan != 0 || lines != abs(info->bmiHeader.biHeight)) {
+        dprintf(("WARNING: SetDIBitsToDevice: startscan != 0 || lines != abs(info->bmiHeader.biHeight"));
+    }
+
     //If upside down, reverse scanlines and call SetDIBitsToDevice again
 //    if(info->bmiHeader.biHeight < 0 && info->bmiHeader.biBitCount != 8 && info->bmiHeader.biCompression == 0) {
@@ -257 +262 @@
         // upside down
         INT rc = -1;
-        BITMAPINFO newInfo;
-        newInfo.bmiHeader = info->bmiHeader;
-        long lLineByte = ((newInfo.bmiHeader.biWidth * (info->bmiHeader.biBitCount == 15 ? 16 : info->bmiHeader.biBitCount) + 31) / 32) * 4;
-        long lHeight   = -newInfo.bmiHeader.biHeight;
-        newInfo.bmiHeader.biHeight = -info->bmiHeader.biHeight;
+        long lLineByte = DIB_GetDIBWidthBytes(info->bmiHeader.biWidth, info->bmiHeader.biBitCount);
+        long lHeight   = -info->bmiHeader.biHeight;
+
+        //TODO: doesn't work if memory is readonly!!
+        ((BITMAPINFO *)info)->bmiHeader.biHeight = -info->bmiHeader.biHeight;
 
         char *newBits = (char *)malloc( lLineByte * lHeight );
@@ -273 +278 @@
             }
             //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 );
+            rc = SetDIBitsToDevice( hdc, xDest, yDest, cx, cy, 0, 0, startscan, lines, (void *)newBits, info, coloruse );
             free( newBits );
         }
         else DebugInt3();
+
+        //TODO: doesn't work if memory is readonly!!
+        ((BITMAPINFO *)info)->bmiHeader.biHeight = -info->bmiHeader.biHeight;
 
         return rc;