Changeset 5901 for trunk/src

Timestamp:

Jun 3, 2001, 4:52:47 PM (24 years ago)

Author:

sandervl

Message:

rgb conversions added + palette fix

Location:

trunk/src/gdi32

Files:

• blit.cpp (modified) (4 diffs)
• dibitmap.cpp (modified) (4 diffs)
• dibsect.cpp (modified) (3 diffs)
• palette.cpp (modified) (3 diffs)

trunk/src/gdi32/blit.cpp

@@ -1 @@
-/* $Id: blit.cpp,v 1.30 2001-06-02 07:24:38 sandervl Exp $ */
+/* $Id: blit.cpp,v 1.31 2001-06-03 14:52:46 sandervl Exp $ */
 
 /*
@@ -23 +23 @@
 
 static ULONG QueryPaletteSize(BITMAPINFOHEADER *pBHdr);
-static ULONG CalcBitmapSize(ULONG cBits, LONG cx, LONG cy);
+ULONG CalcBitmapSize(ULONG cBits, LONG cx, LONG cy);
 
 //******************************************************************************
@@ -452 +452 @@
         break;
     }
-
     if(bitfields[1] == 0x3E0) 
     {//RGB 555?
@@ -582 +581 @@
 //******************************************************************************
 //******************************************************************************
-static ULONG CalcBitmapSize(ULONG cBits, LONG cx, LONG cy)
+ULONG CalcBitmapSize(ULONG cBits, LONG cx, LONG cy)
 {
         ULONG alignment;

trunk/src/gdi32/dibitmap.cpp

@@ -1 @@
-/* $Id: dibitmap.cpp,v 1.19 2001-06-01 12:29:25 sandervl Exp $ */
+/* $Id: dibitmap.cpp,v 1.20 2001-06-03 14:52:47 sandervl Exp $ */
 
 /*
@@ -15 +15 @@
 #include <string.h>
 #include <misc.h>
+#include <cpuhlp.h>
 #include <winuser32.h>
 #include "dibsect.h"
+#include "rgbcvt.h"
 
 #define DBG_LOCALLOG    DBG_dibitmap
 #include "dbglocal.h"
+
+ULONG CalcBitmapSize(ULONG cBits, LONG cx, LONG cy);
 
 //******************************************************************************
@@ -296 +300 @@
 #endif
 
-    // set proper color masks!
+    // 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))[1] = 0x03E0;
        ((DWORD*)(lpbi->bmiColors))[2] = 0x001F;
        break;
@@ -310 +314 @@
        break;
     }
+    if(lpvBits && lpbi->bmiHeader.biBitCount == 16 && ((DWORD*)(lpbi->bmiColors))[1] == 0x3E0) 
+    {//RGB 555?
+        dprintf(("RGB 565->555 conversion required"));
+
+        int imgsize = CalcBitmapSize(lpbi->bmiHeader.biBitCount,
+                                     lpbi->bmiHeader.biWidth, lpbi->bmiHeader.biHeight);
+
+        if(CPUFeatures & CPUID_MMX) {
+             RGB565to555MMX((WORD *)lpvBits, (WORD *)lpvBits, imgsize/sizeof(WORD));
+        }
+        else RGB565to555((WORD *)lpvBits, (WORD *)lpvBits, imgsize/sizeof(WORD));
+    }
+
     //WGSS/Open32 returns 0 when querying the bitmap info; must return nr of scanlines
     //as 0 signals failure

trunk/src/gdi32/dibsect.cpp

@@ -1 @@
-/* $Id: dibsect.cpp,v 1.52 2001-05-29 09:45:21 sandervl Exp $ */
+/* $Id: dibsect.cpp,v 1.53 2001-06-03 14:52:47 sandervl Exp $ */
 
 /*
@@ -746 +746 @@
   memcpy(pOS2bmp, tmphdr, os2bmphdrsize);
 
-#if 0
   if(dibinfo.dsBitfields[1] == 0x3E0) {//RGB 555?
     dprintf(("DIBSection::sync: convert RGB 565 to RGB 555"));
@@ -757 +756 @@
     else    RGB565to555((WORD *)destBuf, (WORD *)destBuf, (nDestHeight*dibinfo.dsBm.bmWidthBytes)/sizeof(WORD));
   }
-#endif
+
   free(tmphdr);
   if(rc != nDestHeight) {

trunk/src/gdi32/palette.cpp

@@ -1 @@
-/* $Id: palette.cpp,v 1.9 2001-05-29 09:45:21 sandervl Exp $ */
+/* $Id: palette.cpp,v 1.10 2001-06-03 14:52:47 sandervl Exp $ */
 
 /*
@@ -58 +58 @@
     rc = O32_RealizePalette(hdc);
     dprintf(("GDI32: RealizePalette %x returned %d", hdc, rc));
+    if(rc && DIBSection::getSection() != NULL)
+    {
+        DIBSection *dsect = DIBSection::findHDC(hdc);
+        if(dsect)
+        {
+            dsect->sync(hdc, 0, dsect->GetHeight());
+        }
+    }
     return rc;
 }
@@ -85 +93 @@
   dprintf(("GDI32: SelectPalette (0x%08X, 0x%08X, 0x%08X)", hdc, hPalette, bForceBackground));
   hPal = O32_SelectPalette(hdc, hPalette, bForceBackground);
-
-  //hack for beyond compare buttons (+ other apps)
-  //seems to select old palette into dc before unselecting dib section
-  if(bForceBackground != -1 && DIBSection::getSection() != NULL)
-  {
-    DIBSection *dsect = DIBSection::findHDC(hdc);
-    if(dsect)
-    {
-        dsect->sync(hdc, 0, dsect->GetHeight());
-    }
-  }
   return hPal;
 }