Changeset 7327 for trunk/src/gdi32/dibitmap.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/dibitmap.cpp (modified) (4 diffs)

trunk/src/gdi32/dibitmap.cpp

@@ -1 @@
-/* $Id: dibitmap.cpp,v 1.27 2001-08-28 18:58:57 sandervl Exp $ */
+/* $Id: dibitmap.cpp,v 1.28 2001-11-13 13:18:22 sandervl Exp $ */
 
 /*
@@ -96 +96 @@
         bitfields[2] = (lpbmih->biCompression == BI_BITFIELDS) ?  *((DWORD *)lpbmi->bmiColors + 2) : 0x001f;
         break;
+    case 24:
     case 32:
-        bitfields[0] = (lpbmih->biCompression == BI_BITFIELDS) ? *(DWORD *)lpbmi->bmiColors : 0xff0000;
+        bitfields[0] = (lpbmih->biCompression == BI_BITFIELDS) ? *(DWORD *)lpbmi->bmiColors        : 0xff0000;
         bitfields[1] = (lpbmih->biCompression == BI_BITFIELDS) ?  *((DWORD *)lpbmi->bmiColors + 1) : 0xff00;
         bitfields[2] = (lpbmih->biCompression == BI_BITFIELDS) ?  *((DWORD *)lpbmi->bmiColors + 2) : 0xff;
@@ -361 +362 @@
         case 24:
         case 32:
-           ((DWORD*)(lpbi->bmiColors))[0] = 0x0000FF;
+           ((DWORD*)(lpbi->bmiColors))[0] = 0xFF0000;
            ((DWORD*)(lpbi->bmiColors))[1] = 0x00FF00;
-           ((DWORD*)(lpbi->bmiColors))[2] = 0xFF0000;
+           ((DWORD*)(lpbi->bmiColors))[2] = 0x0000FF;
            break;
         }
@@ -448 +449 @@
         bitfields[2] = (pBitmapInfo->bmiHeader.biCompression == BI_BITFIELDS) ?  *((DWORD *)pBitmapInfo->bmiColors + 2) : 0x001f;
         break;
+
+    case 24:
     case 32:
         bitfields[0] = (pBitmapInfo->bmiHeader.biCompression == BI_BITFIELDS) ? *(DWORD *)pBitmapInfo->bmiColors : 0xff0000;