Changeset 6182 for trunk/src

Timestamp:

Jul 6, 2001, 3:46:07 PM (24 years ago)

Author:

sandervl

Message:

GetDIBits fix

File:

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

trunk/src/gdi32/dibitmap.cpp

@@ -1 @@
-/* $Id: dibitmap.cpp,v 1.24 2001-07-04 08:03:54 sandervl Exp $ */
+/* $Id: dibitmap.cpp,v 1.25 2001-07-06 13:46:07 sandervl Exp $ */
 
 /*
@@ -326 +326 @@
     DeleteDC(hdcMem);
 
-    // set proper color masks
-    switch(lpbi->bmiHeader.biBitCount) {
-    case 15:
-    case 16: //RGB 565
-       ((DWORD*)(lpbi->bmiColors))[0] = 0x7c00;
-       ((DWORD*)(lpbi->bmiColors))[1] = 0x03E0;
-       ((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;
+    if(lpvBits) {
+        // set proper color masks (only if lpvBits not NULL)
+        switch(lpbi->bmiHeader.biBitCount) {
+        case 15:
+        case 16: //RGB 565
+           ((DWORD*)(lpbi->bmiColors))[0] = 0x7c00;
+           ((DWORD*)(lpbi->bmiColors))[1] = 0x03E0;
+           ((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;
+        }
     }
     if(nrlines && lpvBits && lpbi->bmiHeader.biBitCount == 16 && ((DWORD*)(lpbi->bmiColors))[1] == 0x3E0)