Changeset 9565 for trunk/src

Timestamp:

Dec 30, 2002, 3:05:21 PM (23 years ago)

Author:

sandervl

Message:

Support reversed bitmap data in SetDIBits

File:

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

trunk/src/gdi32/dibitmap.cpp

@@ -1 @@
-/* $Id: dibitmap.cpp,v 1.35 2002-11-26 10:53:07 sandervl Exp $ */
+/* $Id: dibitmap.cpp,v 1.36 2002-12-30 14:05:21 sandervl Exp $ */
 
 /*
@@ -53 +53 @@
         ((BITMAPINFOHEADER *)lpbmih)->biHeight = -lpbmih->biHeight;
 
-        if(lpbInit && fdwInit == CBM_INIT) {
+        if(lpbInit && fdwInit == CBM_INIT) 
+        {
             // upside down
             HBITMAP rc = 0;
@@ -69 +70 @@
                 }
                 rc = CreateDIBitmap(hdc, lpbmih, fdwInit, newbits, lpbmi, fuUsage);
-                        free( newbits );
+                free( newbits );
             }
 
@@ -544 +545 @@
     }
 
-    if(pBitmapInfo->bmiHeader.biHeight < 0) {
-        dprintf(("!WARNING! Negative height!!"));
-    }
-    ret = O32_SetDIBits(hdc, hBitmap, startscan, numlines, pBits, pBitmapInfo, usage);
+    //If upside down, reverse scanlines and call SetDIBits again
+    if(pBitmapInfo->bmiHeader.biHeight < 0 && (pBitmapInfo->bmiHeader.biCompression == BI_RGB ||
+       pBitmapInfo->bmiHeader.biCompression == BI_BITFIELDS)) 
+    {
+        // upside down
+        INT rc = -1;
+        long lLineByte;
+
+        //TODO: doesn't work if memory is readonly!!
+        ((BITMAPINFO *)pBitmapInfo)->bmiHeader.biHeight = -pBitmapInfo->bmiHeader.biHeight;
+
+        lLineByte = DIB_GetDIBWidthBytes(pBitmapInfo->bmiHeader.biWidth, pBitmapInfo->bmiHeader.biBitCount);
+
+        dprintf(("Reverse bitmap (negative height)"));
+        char *pNewBits = (char *)malloc( lLineByte * numlines );
+        if(pNewBits) {
+            unsigned char *pbSrc = (unsigned char *)pBits + lLineByte * (numlines - 1);
+            unsigned char *pbDst = (unsigned char *)pNewBits;
+            for(int y = 0; y < numlines; y++) {
+                memcpy( pbDst, pbSrc, lLineByte );
+                pbDst += lLineByte;
+                pbSrc -= lLineByte;
+            }
+            ret = O32_SetDIBits(hdc, hBitmap, startscan, numlines, pNewBits, pBitmapInfo, usage);
+            free(pNewBits);
+        }
+        else DebugInt3();
+
+        //TODO: doesn't work if memory is readonly!!
+        ((BITMAPINFO *)pBitmapInfo)->bmiHeader.biHeight = -pBitmapInfo->bmiHeader.biHeight;
+    }
+    else {
+        ret = O32_SetDIBits(hdc, hBitmap, startscan, numlines, pBits, pBitmapInfo, usage);
+    }
     if(newbits) free(newbits);