Changeset 4484 for trunk/src/gdi32/dibitmap.cpp

Timestamp:

Oct 16, 2000, 1:01:47 PM (25 years ago)

Author:

sandervl

Message:

MN: GetDIBits fix for color masks

File:

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

trunk/src/gdi32/dibitmap.cpp

@@ -1 @@
-/* $Id: dibitmap.cpp,v 1.9 2000-09-01 01:36:14 phaller Exp $ */
+/* $Id: dibitmap.cpp,v 1.10 2000-10-16 11:01:47 sandervl Exp $ */
 
 /*
@@ -270 +270 @@
  int rc;
 
-    rc =  O32_GetDIBits(hdc, hBitmap, uStartScan, cScanLines, lpvBits, lpbi, uUsage);
+    rc = O32_GetDIBits(hdc, hBitmap, uStartScan, cScanLines, lpvBits, lpbi, uUsage);
+    // set proper color masks!
+    switch(lpbi->bmiHeader.biBitCount) {
+    case 16: //RGB 565
+       ((DWORD*)(lpbi->bmiColors))[0] = 0xF800;
+       ((DWORD*)(lpbi->bmiColors))[1] = 0x07E0;
+       ((DWORD*)(lpbi->bmiColors))[2] = 0x001F;
+       break;
+    case 24:
+    case 32:
+       ((DWORD*)(lpbi->bmiColors))[0] = 0x0000FF;
+       ((DWORD*)(lpbi->bmiColors))[1] = 0x00FF00;
+       ((DWORD*)(lpbi->bmiColors))[2] = 0xFF0000;
+       break; 
+    }
+
     dprintf(("GDI32: GetDIBits %x %x %d %d %x %x %d returned %d", hdc, hBitmap, uStartScan, cScanLines, lpvBits, lpbi, uUsage, rc));
     return rc;