Changeset 4034 for trunk/src/gdi32/dibsect.cpp

Timestamp:

Aug 18, 2000, 8:14:59 PM (25 years ago)

Author:

sandervl

Message:

lots of small changes; CreateHalftonePalette + rgb 565 -> rgb 555 conversion

File:

• trunk/src/gdi32/dibsect.cpp (modified) (4 diffs)

trunk/src/gdi32/dibsect.cpp

@@ -1 @@
-/* $Id: dibsect.cpp,v 1.36 2000-06-26 10:27:45 sandervl Exp $ */
+/* $Id: dibsect.cpp,v 1.37 2000-08-18 18:14:57 sandervl Exp $ */
 
 /*
  * GDI32 DIB sections
  *
- * Copyright 1998 Sander van Leeuwen (sandervl@xs4all.nl)
+ * Copyright 1998-2000 Sander van Leeuwen (sandervl@xs4all.nl)
  * Copyright 1998 Patrick Haller
  *
@@ -131 +131 @@
 
    dibinfo.dshSection       = handle;
-   dibinfo.dsOffset         = 0; // TODO: put the correct value here (if createdibsection with file handle)
+   dibinfo.dsOffset         = dwOffset;
 
    if(iUsage == DIB_PAL_COLORS || pbmi->biBitCount <= 8)
@@ -555 +555 @@
   dprintf(("Sync destination dibsection %x (%x)", handle, hdc));
 
-  //todo: rgb 565 to 555 conversion if bpp == 16
-  if(GetBitCount() == 16) {
-        dprintf(("WARNING: need to convert RGB 565 to RGB 555!!"));
-  }
-
   BITMAPINFO2 *tmphdr = (BITMAPINFO2 *)malloc(os2bmphdrsize);
   memcpy(tmphdr, pOS2bmp, os2bmphdrsize);
@@ -582 +577 @@
                           tmphdr);
   }
+  if(dibinfo.dsBitfields[1] == 0x3E0) {//RGB 555?
+        dprintf(("DIBSection::sync: convert RGB 565 to RGB 555"));
+
+        destBuf = GetDIBObject() + nYdest*dibinfo.dsBm.bmWidthBytes;
+
+        if(CPUFeatures & CPUID_MMX) {
+                RGB565to555MMX((WORD *)destBuf, (WORD *)destBuf, (nDestHeight*dibinfo.dsBm.bmWidthBytes)/sizeof(WORD));
+        }
+        else    RGB565to555((WORD *)destBuf, (WORD *)destBuf, (nDestHeight*dibinfo.dsBm.bmWidthBytes)/sizeof(WORD));
+  }
   free(tmphdr);
   if(rc != nDestHeight) {