Changeset 3235 for trunk/src

Timestamp:

Mar 25, 2000, 1:19:08 PM (25 years ago)

Author:

sandervl

Message:

dibsection blit + setdibits fixes

Location:

trunk/src/gdi32

Files:

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

trunk/src/gdi32/dibitmap.cpp

@@ -1 @@
-/* $Id: dibitmap.cpp,v 1.6 2000-03-24 19:24:47 sandervl Exp $ */
+/* $Id: dibitmap.cpp,v 1.7 2000-03-25 12:19:07 sandervl Exp $ */
 
 /*
@@ -50 +50 @@
 HBITMAP WIN32API CreateCompatibleBitmap( HDC hdc, int nWidth, int nHeight)
 {
-    dprintf(("GDI32: CreateCompatibleBitmap %x (%d,%d)", hdc, nWidth, nHeight));
-    return O32_CreateCompatibleBitmap(hdc, nWidth, nHeight);
+ HBITMAP hBitmap;
+
+    hBitmap = O32_CreateCompatibleBitmap(hdc, nWidth, nHeight);
+    dprintf(("GDI32: CreateCompatibleBitmap %x (%d,%d) returned %x", hdc, nWidth, nHeight, hBitmap));
+    return hBitmap;
 }
 //******************************************************************************
@@ -66 +69 @@
                                  UINT cBitsPerPel, const void *lpvBits)
 {
- HBITMAP rc;
-
-    rc = O32_CreateBitmap(nWidth, nHeight, cPlanes, cBitsPerPel, lpvBits);
-    dprintf(("GDI32: CreateBitmap (%d,%d) bps %d returned %x", nWidth, nHeight, cBitsPerPel, rc));
-    return(rc);
+ HBITMAP hBitmap;
+
+    hBitmap = O32_CreateBitmap(nWidth, nHeight, cPlanes, cBitsPerPel, lpvBits);
+    dprintf(("GDI32: CreateBitmap (%d,%d) bps %d returned %x", nWidth, nHeight, cBitsPerPel, hBitmap));
+    return(hBitmap);
 }
 //******************************************************************************

trunk/src/gdi32/dibsect.cpp

@@ -1 @@
-/* $Id: dibsect.cpp,v 1.22 2000-03-24 19:24:47 sandervl Exp $ */
+/* $Id: dibsect.cpp,v 1.23 2000-03-25 12:19:07 sandervl Exp $ */
 
 /*
@@ -38 +38 @@
 //******************************************************************************
 DIBSection::DIBSection(BITMAPINFOHEADER_W *pbmi, char *pColors, DWORD iUsage, DWORD hSection, DWORD dwOffset, DWORD handle, int fFlip)
-                : bmpBits(NULL), pOS2bmp(NULL), next(NULL)
+                : bmpBits(NULL), pOS2bmp(NULL), next(NULL), bmpBitsRGB565(NULL)
 {
   int  os2bmpsize;
@@ -145 +145 @@
                 dibinfo.dsBitfields[1] = (pbmi->biCompression == BI_BITFIELDS) ? *((DWORD *)pColors + 1) : 0x03e0;
                 dibinfo.dsBitfields[2] = (pbmi->biCompression == BI_BITFIELDS) ? *((DWORD *)pColors + 2) : 0x001f;
+
+                //double buffer for rgb 555 dib sections (for conversion)
+                if(dibinfo.dsBitfields[1] == 0x03e0) {
+                        DosAllocMem((PPVOID)&bmpBitsRGB565, bmpsize*pbmi->biHeight, PAG_READ|PAG_WRITE|PAG_COMMIT);
+                }
                 break;
 
@@ -202 +207 @@
    if(bmpBits)
         DosFreeMem(bmpBits);
+
+   if(bmpBitsRGB565)
+        DosFreeMem(bmpBitsRGB565);
 
    if(pOS2bmp)
@@ -302 +310 @@
    dibinfo.dsOffset         = 0; // TODO: put the correct value here (if createdibsection with file handle)
 
-   if(pbmi->biCompression == BI_BITFIELDS) 
-   {
+   if(coloruse == DIB_PAL_COLORS || pbmi->biBitCount <= 8)
+   {
+        dibinfo.dsBitfields[0] = dibinfo.dsBitfields[1] = dibinfo.dsBitfields[2] = 0;
+   }
+   else {
         char *pColors = (char *)pbmi + 1;
 
-        dibinfo.dsBitfields[0] = *((DWORD *)pColors);
-        dibinfo.dsBitfields[1] = *((DWORD *)pColors+1);
-        dibinfo.dsBitfields[2] = *((DWORD *)pColors+2);
+        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]));
    }
@@ -411 +442 @@
         dprintf(("DIBSection::BitBlt; convert rgb 555 to 565"));
 
-        bitmapBits = (WORD *)malloc(pOS2bmp->cbImage);
+        if(bmpBitsRGB565 == NULL)
+                DebugInt3();
+
         if(CPUFeatures & CPUID_MMX) {
-                RGB555to565MMX((WORD *)bitmapBits, (WORD *)bmpBits, pOS2bmp->cbImage/sizeof(WORD));
+                RGB555to565MMX((WORD *)bmpBitsRGB565, (WORD *)bmpBits, pOS2bmp->cbImage/sizeof(WORD));
         }
-        else    RGB555to565((WORD *)bitmapBits, (WORD *)bmpBits, pOS2bmp->cbImage/sizeof(WORD));
-        rc = GpiDrawBits(hps, bitmapBits, pOS2bmp, 4, &point[0], ROP_SRCCOPY, BBO_OR);
-        free(bitmapBits);
+        else    RGB555to565((WORD *)bmpBitsRGB565, (WORD *)bmpBits, pOS2bmp->cbImage/sizeof(WORD));
+        rc = GpiDrawBits(hps, bmpBitsRGB565, pOS2bmp, 4, &point[0], ROP_SRCCOPY, BBO_OR);
   }
   else  rc = GpiDrawBits(hps, bmpBits, pOS2bmp, 4, &point[0], ROP_SRCCOPY, BBO_OR);

trunk/src/gdi32/dibsect.h

@@ -1 @@
-/* $Id: dibsect.h,v 1.13 2000-03-24 19:24:48 sandervl Exp $ */
+/* $Id: dibsect.h,v 1.14 2000-03-25 12:19:08 sandervl Exp $ */
 
 /*
@@ -102 +102 @@
           HWND  hwndParent;
           HDC   hdc;
-          char *bmpBits;
+          char *bmpBits, *bmpBitsRGB565;
           BOOL  fFlip;
           int   bmpsize;