Changeset 3227 for trunk/src

Timestamp:

Mar 24, 2000, 8:24:48 PM (26 years ago)

Author:

sandervl

Message:

default to rgb555 for 16 bits dib sections

Location:

trunk/src/gdi32

Files:

• dibitmap.cpp (modified) (2 diffs)
• dibsect.cpp (modified) (3 diffs)
• dibsect.h (modified) (2 diffs)

trunk/src/gdi32/dibitmap.cpp

@@ -1 @@
-/* $Id: dibitmap.cpp,v 1.5 2000-03-16 19:18:14 sandervl Exp $ */
+/* $Id: dibitmap.cpp,v 1.6 2000-03-24 19:24:47 sandervl Exp $ */
 
 /*
@@ -69 +69 @@
 
     rc = O32_CreateBitmap(nWidth, nHeight, cPlanes, cBitsPerPel, lpvBits);
-    dprintf(("GDI32: CreateBitmap (%d,%d) bps %d returned %d\n", nWidth, nHeight, cBitsPerPel, rc));
+    dprintf(("GDI32: CreateBitmap (%d,%d) bps %d returned %x", nWidth, nHeight, cBitsPerPel, rc));
     return(rc);
 }

trunk/src/gdi32/dibsect.cpp

@@ -1 @@
-/* $Id: dibsect.cpp,v 1.21 2000-03-21 19:46:47 sandervl Exp $ */
+/* $Id: dibsect.cpp,v 1.22 2000-03-24 19:24:47 sandervl Exp $ */
 
 /*
@@ -73 +73 @@
                 bmpsize *= 4;
                 break;
+        default:
+                dprintf(("Unsupported nr of bits %d", pbmi->biBitCount));
+                DebugInt3();
+                break;
    }
 
@@ -130 +134 @@
    dibinfo.dsOffset         = 0; // TODO: put the correct value here (if createdibsection with file handle)
 
-   if(pbmi->biCompression == BI_BITFIELDS) {
-        dibinfo.dsBitfields[0] = *((DWORD *)pColors);
-        dibinfo.dsBitfields[1] = *((DWORD *)pColors+1);
-        dibinfo.dsBitfields[2] = *((DWORD *)pColors+2);
+   if(iUsage == DIB_PAL_COLORS || pbmi->biBitCount <= 8)
+   {
+        dibinfo.dsBitfields[0] = dibinfo.dsBitfields[1] = dibinfo.dsBitfields[2] = 0;
+   }
+   else {
+        switch(pbmi->biBitCount)
+        {
+           case 16:
+                dibinfo.dsBitfields[0] = (pbmi->biCompression == BI_BITFIELDS) ? *(DWORD *)pColors : 0x7c00;
+                dibinfo.dsBitfields[1] = (pbmi->biCompression == BI_BITFIELDS) ? *((DWORD *)pColors + 1) : 0x03e0;
+                dibinfo.dsBitfields[2] = (pbmi->biCompression == BI_BITFIELDS) ? *((DWORD *)pColors + 2) : 0x001f;
+                break;
+
+           case 24:
+                dibinfo.dsBitfields[0] = 0xff;
+                dibinfo.dsBitfields[1] = 0xff00;
+                dibinfo.dsBitfields[2] = 0xff0000;
+                break;
+
+           case 32:
+                dibinfo.dsBitfields[0] = (pbmi->biCompression == BI_BITFIELDS) ? *(DWORD *)pColors : 0xff;
+                dibinfo.dsBitfields[1] = (pbmi->biCompression == BI_BITFIELDS) ? *((DWORD *)pColors + 1) : 0xff00;
+                dibinfo.dsBitfields[2] = (pbmi->biCompression == BI_BITFIELDS) ? *((DWORD *)pColors + 2) : 0xff0000;
+                if(dibinfo.dsBitfields[0] != 0xff && dibinfo.dsBitfields[1] != 0xff00 && dibinfo.dsBitfields[2] != 0xff0000) {
+                        dprintf(("DIBSection: unsupported bitfields for 32 bits bitmap!!"));
+                }
+                break;
+        }
         dprintf(("BI_BITFIELDS %x %x %x", dibinfo.dsBitfields[0], dibinfo.dsBitfields[1], dibinfo.dsBitfields[2]));
    }

trunk/src/gdi32/dibsect.h

@@ -1 @@
-/* $Id: dibsect.h,v 1.12 2000-02-10 00:36:10 sandervl Exp $ */
+/* $Id: dibsect.h,v 1.13 2000-03-24 19:24:48 sandervl Exp $ */
 
 /*
@@ -50 +50 @@
 
 #ifdef OS2_ONLY
+#define DIB_RGB_COLORS   0
+#define DIB_PAL_COLORS   1
+
 typedef struct
 {