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

Timestamp:

Nov 13, 2001, 2:18:22 PM (24 years ago)

Author:

sandervl

Message:

workaround added for 32 bpp blitting with matrox display driver

File:

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

trunk/src/gdi32/blit.cpp

@@ -1 @@
-/* $Id: blit.cpp,v 1.34 2001-09-10 11:02:40 sandervl Exp $ */
+/* $Id: blit.cpp,v 1.35 2001-11-13 13:18:22 sandervl Exp $ */
 
 /*
@@ -147 +147 @@
         bitfields[2] = (info->bmiHeader.biCompression == BI_BITFIELDS) ?  *((DWORD *)info->bmiColors + 2) : 0x001f;
         break;
+
+    case 24:
     case 32:
         bitfields[0] = (info->bmiHeader.biCompression == BI_BITFIELDS) ? *(DWORD *)info->bmiColors : 0xff0000;
@@ -226 +228 @@
                                const BITMAPINFO *info, UINT coloruse)
 {
+    static BOOL fMatrox32BppBug = FALSE;
+    INT rc = 0;
+    char *newBits = NULL;
+
+    //If upside down, reverse scanlines and call SetDIBitsToDevice again
     if(info->bmiHeader.biHeight < 0 && info->bmiHeader.biBitCount != 8 && info->bmiHeader.biCompression == 0) {
         // upside down
-        INT rc = 0;
+        INT rc = -1;
         BITMAPINFO newInfo;
         newInfo.bmiHeader = info->bmiHeader;
@@ -244 +251 @@
                 pbSrc -= lLineByte;
             }
-            rc = SetDIBitsToDevice_( hdc, xDest, yDest, cx, cy, xSrc, ySrc, startscan, lines, (void *)newBits, &newInfo, DIB_RGB_COLORS );
+            rc = SetDIBitsToDevice( hdc, xDest, yDest, cx, cy, xSrc, ySrc, startscan, lines, (void *)newBits, &newInfo, coloruse );
             free( newBits );
         }
+        else DebugInt3();
+
         return rc;
     }
+
+    //We must convert 32 bpp bitmap data to 24 bpp on systems with the Matrox 
+    //display driver. (GpiDrawBits for 32 bpp fails with insufficient memory error)
+    if(info->bmiHeader.biBitCount == 32 && fMatrox32BppBug) 
+    {
+        BITMAPINFO newInfo;
+        newInfo.bmiHeader = info->bmiHeader;
+
+        long lLineWidth;
+        long lHeight    = (newInfo.bmiHeader.biHeight > 0) ? newInfo.bmiHeader.biHeight : -newInfo.bmiHeader.biHeight;
+        long lWidth     = newInfo.bmiHeader.biWidth;
+
+        newInfo.bmiHeader.biBitCount  = 24;
+        newInfo.bmiHeader.biSizeImage = CalcBitmapSize(24, newInfo.bmiHeader.biWidth, 
+                                                       newInfo.bmiHeader.biHeight);
+
+        lLineWidth = newInfo.bmiHeader.biSizeImage / lHeight;
+
+        //convert 32 bits bitmap data to 24 bits
+        newBits = (char *)malloc(newInfo.bmiHeader.biSizeImage+16); //extra room needed for copying (too much)
+        if(!newBits) {
+            DebugInt3();
+            return -1;
+        }
+        unsigned char *pbSrc = (unsigned char *)bits;
+        unsigned char *pbDst = (unsigned char *)newBits;
+        //not very efficient
+        for(int i = 0; i < lHeight; i++) {
+            for(int j=0;j<lWidth;j++) {
+                *(DWORD *)pbDst = *(DWORD *)pbSrc;
+                pbSrc += 4;
+                pbDst += 3;
+            }
+            //24 bpp scanline must be aligned at 4 byte boundary
+            pbDst += (lLineWidth - 3*lWidth);
+        }
+        rc = SetDIBitsToDevice_( hdc, xDest, yDest, cx, cy, xSrc, ySrc, startscan, lines, newBits, &newInfo, coloruse );
+        free(newBits);
+        return rc;
+    }
+    rc = SetDIBitsToDevice_( hdc, xDest, yDest, cx, cy, xSrc, ySrc, startscan, lines, bits, info, coloruse );
+
+    if(rc == -1 && info->bmiHeader.biBitCount == 32 && !fMatrox32BppBug) 
+    {
+        //The Matrox driver seems to have some difficulty blitting 32bpp
+        //data. (out of memory error) The same operation works fine with SDD.
+        fMatrox32BppBug = TRUE;
+        return SetDIBitsToDevice(hdc, xDest, yDest, cx,
+                                 cy, xSrc, ySrc,
+                                 startscan, lines, bits,
+                                 info, coloruse);
+    }
+    return rc;
+
 //SvL: Breaks startup bitmap of Acrobat Reader 4.05
 #if 0
@@ -319 +382 @@
     } 
 #endif
-    else {
-        return SetDIBitsToDevice_( hdc, xDest, yDest, cx, cy, xSrc, ySrc, startscan, lines, bits, info, coloruse );
-    }
 }
 //******************************************************************************
@@ -441 +501 @@
         bitfields[2] = (info->bmiHeader.biCompression == BI_BITFIELDS) ?  *((DWORD *)info->bmiColors + 2) : 0x001f;
         break;
+    case 24:
     case 32:
         bitfields[0] = (info->bmiHeader.biCompression == BI_BITFIELDS) ? *(DWORD *)info->bmiColors : 0xff0000;
@@ -470 +531 @@
         ((BITMAPINFO *)info)->bmiHeader.biCompression = 0;
         compression = BI_BITFIELDS;
-
     }
 
@@ -629 +689 @@
 
                 case 32:
-                        return cx*cy;
+                        return cx*cy*4;
 
                 default: