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

Timestamp:

Feb 3, 2000, 12:45:07 AM (26 years ago)

Author:

sandervl

Message:

RGB 555 conversion in SetDIBitsToDevice + quake 2 BitBlt fix

File:

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

trunk/src/gdi32/blit.cpp

@@ -1 @@
-/* $Id: blit.cpp,v 1.1 2000-02-01 12:53:29 sandervl Exp $ */
+/* $Id: blit.cpp,v 1.2 2000-02-02 23:45:06 sandervl Exp $ */
 
 /*
@@ -71 +71 @@
                         }
                 }
+                return rc;
         }
     }
@@ -85 +86 @@
     INT result, imgsize, palsize, height, width;
     char *ptr;
+    ULONG compression = 0;
+    WORD *newbits = 0;
 
     SetLastError(0);
@@ -126 +129 @@
 
     //SvL: Ignore BI_BITFIELDS type (SetDIBitsToDevice fails otherwise)
-    if(info->bmiHeader.biCompression == BI_BITFIELDS)
+    if(info->bmiHeader.biCompression == BI_BITFIELDS) {
+        DWORD *bitfields = (DWORD *)info->bmiColors;
+
+        dprintf(("BI_BITFIELDS compression %x %x %x", *bitfields, *(bitfields+1), *(bitfields+2))); 
         ((BITMAPINFO *)info)->bmiHeader.biCompression = 0;
+        compression = BI_BITFIELDS;
+        if(*(bitfields+1) == 0x3E0) {//RGB 555?
+          WORD *dstbits, *srcbits;
+          WORD  pixel;
+
+                newbits = dstbits = (WORD *)malloc(imgsize);
+                srcbits = (WORD *)bits;
+                for(int i=0;i<imgsize/sizeof(WORD);i++) {
+                        pixel     = *dstbits = *srcbits++;
+                        *dstbits &= 0x1F;
+                        pixel    &= 0x7FE0;
+                        pixel   <<= 1;
+                        *dstbits  = *dstbits | pixel;
+                        dstbits++;
+                }
+                bits = newbits;
+        }
+    }
+
     if(info->bmiHeader.biHeight < 0)
         ((BITMAPINFO *)info)->bmiHeader.biHeight = -info->bmiHeader.biHeight;
 
-//    result = OSLibSetDIBitsToDevice(hdc, xDest, yDest, cx, cy, xSrc, ySrc, startscan, lines, (PVOID) bits, (WINBITMAPINFOHEADER *)info, coloruse);
-//    result = 1;
     result = O32_SetDIBitsToDevice(hdc, xDest, yDest, cx, cy, xSrc, ySrc, startscan, lines, (PVOID) bits, (PBITMAPINFO)info, coloruse);
     //SvL: Wrong Open32 return value
@@ -141 +164 @@
     dprintf(("GDI32: SetDIBitsToDevice %d %d %d %d %x %d", info->bmiHeader.biWidth, info->bmiHeader.biHeight, info->bmiHeader.biPlanes, info->bmiHeader.biBitCount, info->bmiHeader.biCompression, info->bmiHeader.biSizeImage));
 
+    if(compression == BI_BITFIELDS) {
+        ((BITMAPINFO *)info)->bmiHeader.biCompression = BI_BITFIELDS;
+        if(newbits) free(newbits);
+    }
     return result;