Changeset 5677 for trunk/src

Timestamp:

May 10, 2001, 7:03:18 PM (24 years ago)

Author:

sandervl

Message:

bugfixes

Location:

trunk/src/gdi32

Files:

• blit.cpp (modified) (3 diffs)
• dibsect.cpp (modified) (3 diffs)
• oslibgpi.cpp (modified) (2 diffs)

trunk/src/gdi32/blit.cpp

@@ -1 @@
-/* $Id: blit.cpp,v 1.24 2001-02-23 10:37:42 sandervl Exp $ */
+/* $Id: blit.cpp,v 1.25 2001-05-10 17:03:17 sandervl Exp $ */
 
 /*
@@ -91 +91 @@
 //******************************************************************************
 //******************************************************************************
-INT WIN32API SetDIBitsToDevice(HDC hdc, INT xDest, INT yDest, DWORD cx,
+static INT SetDIBitsToDevice_(HDC hdc, INT xDest, INT yDest, DWORD cx,
                                DWORD cy, INT xSrc, INT ySrc,
                                UINT startscan, UINT lines, LPCVOID bits,
@@ -198 +198 @@
     SetLastError(ERROR_INVALID_PARAMETER);
     return 0;
+}
+//******************************************************************************
+//******************************************************************************
+INT WIN32API SetDIBitsToDevice(HDC hdc, INT xDest, INT yDest, DWORD cx,
+                               DWORD cy, INT xSrc, INT ySrc,
+                               UINT startscan, UINT lines, LPCVOID bits,
+                               const BITMAPINFO *info, UINT coloruse)
+{
+    if(info->bmiHeader.biHeight < 0 && info->bmiHeader.biBitCount != 8 && info->bmiHeader.biCompression == 0) {
+        // upside down
+        INT rc = 0;
+        BITMAPINFO newInfo;
+        newInfo.bmiHeader = info->bmiHeader;
+        long lLineByte = ((newInfo.bmiHeader.biWidth * (info->bmiHeader.biBitCount == 15 ? 16 : info->bmiHeader.biBitCount) + 31) / 32) * 4;
+        long lHeight   = -newInfo.bmiHeader.biHeight;
+        newInfo.bmiHeader.biHeight = -info->bmiHeader.biHeight;
+
+        char *newBits = (char *)malloc( lLineByte * lHeight );
+        if(newBits) {
+            unsigned char *pbSrc = (unsigned char *)bits + lLineByte * (lHeight - 1);
+            unsigned char *pbDst = (unsigned char *)newBits;
+            for(int y = 0; y < lHeight; y++) {
+                memcpy( pbDst, pbSrc, lLineByte );
+                pbDst += lLineByte;
+                pbSrc -= lLineByte;
+            }
+            rc = SetDIBitsToDevice_( hdc, xDest, yDest, cx, cy, xSrc, ySrc, startscan, lines, (void *)newBits, &newInfo, DIB_RGB_COLORS );
+            free( newBits );
+        }
+        return rc;
+    }
+    else
+    if(info->bmiHeader.biBitCount == 8 && info->bmiHeader.biCompression == 0 && !(GetDeviceCaps( hdc, RASTERCAPS ) & RC_PALETTE)) {
+        INT rc = 0;
+        // convert 8bit to 24bit
+
+        BITMAPINFO newInfo;
+        newInfo.bmiHeader = info->bmiHeader;
+        newInfo.bmiHeader.biBitCount = 24;
+        long lLineByte24 = ((newInfo.bmiHeader.biWidth * 24 + 31) / 32) * 4;
+        long lLineByte8  = ((newInfo.bmiHeader.biWidth *  8 + 31) / 32) * 4;
+        long lHeight   = newInfo.bmiHeader.biHeight;
+        if(lHeight < 0) lHeight = -lHeight;
+
+        char *newBits = (char *)malloc( lLineByte24 * lHeight );
+        if(newBits) {
+            //
+            // Get Palette Entries
+            //
+            PALETTEENTRY aEntries[256];
+            LOGPALETTE *pLog = (LOGPALETTE *)malloc( sizeof(LOGPALETTE) + sizeof(PALETTEENTRY) * 256 );
+            pLog->palVersion = 0x300;
+            pLog->palNumEntries = 256;
+
+            HPALETTE hPaletteDummy = CreatePalette( pLog );
+            free( pLog );
+            HPALETTE hPalette = SelectPalette( hdc, hPaletteDummy, FALSE );
+            GetPaletteEntries( hPalette, 0, 255, aEntries  );
+            SelectPalette( hdc, hPalette, FALSE );
+            DeleteObject( hPaletteDummy );
+
+            //
+            // convert 8bit to 24bit
+            //
+            if(newInfo.bmiHeader.biHeight > 0) {
+                unsigned char *pbSrc = (unsigned char *)bits;
+                unsigned char *pbDst = (unsigned char *)newBits;
+                for(int y = 0; y < lHeight; y++) {
+                    for(int x = 0; x < newInfo.bmiHeader.biWidth; x++) {
+                        PALETTEENTRY src = aEntries[pbSrc[x]];
+                        pbDst[x * 3 + 0] = src.peBlue;
+                        pbDst[x * 3 + 1] = src.peGreen;
+                        pbDst[x * 3 + 2] = src.peRed;
+                    }
+                    pbDst += lLineByte24;
+                    pbSrc += lLineByte8;
+                }
+            } else {
+                // upside down
+                newInfo.bmiHeader.biHeight = -info->bmiHeader.biHeight;
+                unsigned char *pbSrc = (unsigned char *)bits + lLineByte8 * (lHeight - 1);
+                unsigned char *pbDst = (unsigned char *)newBits;
+                for(int y = 0; y < lHeight; y++) {
+                    for(int x = 0; x < newInfo.bmiHeader.biWidth; x++) {
+                        PALETTEENTRY src = aEntries[pbSrc[x]];
+                        pbDst[x * 3 + 0] = src.peBlue;
+                        pbDst[x * 3 + 1] = src.peGreen;
+                        pbDst[x * 3 + 2] = src.peRed;
+                    }
+                    pbDst += lLineByte24;
+                    pbSrc -= lLineByte8;
+                }
+            }
+            rc = SetDIBitsToDevice_( hdc, xDest, yDest, cx, cy, xSrc, ySrc, startscan, lines, (void *)newBits, &newInfo, DIB_RGB_COLORS );
+            free( newBits );
+        }
+        return rc;
+    } else {
+        return SetDIBitsToDevice_( hdc, xDest, yDest, cx, cy, xSrc, ySrc, startscan, lines, bits, info, coloruse );
+    }
 }
 //******************************************************************************

trunk/src/gdi32/dibsect.cpp

@@ -1 @@
-/* $Id: dibsect.cpp,v 1.49 2001-03-29 18:52:53 sandervl Exp $ */
+/* $Id: dibsect.cpp,v 1.50 2001-05-10 17:03:18 sandervl Exp $ */
 
 /*
@@ -559 +559 @@
   else  bitmapBits = bmpBits;
 
+  switch(Rop) {
+      case 0xcc0020: /* SRCCOPY */
+          Rop = ROP_SRCCOPY;
+          break;
+      case 0xee0086: /* SRCPAINT */
+          Rop = ROP_SRCPAINT;
+          break;
+      case 0x8800c6: /* SRCAND */
+          Rop = ROP_SRCAND;
+          break;
+      case 0x660046: /* SRCINVERT */
+          Rop = ROP_SRCINVERT;
+          break;
+      case 0x440328: /* SRCERASE */
+          Rop = ROP_SRCERASE;
+          break;
+      case 0x330008: /* NOTSRCCOPY */
+          Rop = ROP_NOTSRCCOPY;
+          break;
+      case 0x1100a6: /* NOTSRCERASE */
+          Rop = ROP_NOTSRCERASE;
+          break;
+      case 0xc000ca: /* MERGECOPY */
+          Rop = ROP_MERGECOPY;
+          break;
+      case 0xbb0226: /* MERGEPAINT */
+          Rop = ROP_MERGEPAINT;
+          break;
+      case 0xf00021: /* PATCOPY */
+          Rop = ROP_PATCOPY;
+          break;
+      case 0xfb0a09: /* PATPAINT */
+          Rop = ROP_PATPAINT;
+          break;
+      case 0x5a0049: /* PATINVERT */
+          Rop = ROP_PATINVERT;
+          break;
+      case 0x550009: /* DSTINVERT */
+          Rop = ROP_DSTINVERT;
+          break;
+      case 0x000042: /* BLACKNESS */
+          Rop = ROP_ZERO;
+          break;
+      case 0xff0062: /* WHITENESS */
+          Rop = ROP_ONE;
+          break;
+      default:
+          Rop = ROP_SRCCOPY;
+          break;
+  }
+
   //SvL: Optimize this.. (don't convert entire bitmap if only a part will be blitted to the dc)
   if(dibinfo.dsBitfields[1] == 0x3E0) {//RGB 555?
@@ -585 +636 @@
 
 
-        rc = GpiDrawBits(hps, bmpBitsDblBuffer, pOS2bmp, 4, &point[0], ROP_SRCCOPY, os2mode);
+        rc = GpiDrawBits(hps, bmpBitsDblBuffer, pOS2bmp, 4, &point[0], Rop, os2mode);
   }
   else {
-        rc = GpiDrawBits(hps, bitmapBits, pOS2bmp, 4, &point[0], ROP_SRCCOPY, os2mode);
+        rc = GpiDrawBits(hps, bitmapBits, pOS2bmp, 4, &point[0], Rop, os2mode);
   }
   if(rc == GPI_OK) {

trunk/src/gdi32/oslibgpi.cpp

@@ -1 @@
-/* $Id: oslibgpi.cpp,v 1.10 2001-02-18 14:19:08 sandervl Exp $ */
+/* $Id: oslibgpi.cpp,v 1.11 2001-05-10 17:03:18 sandervl Exp $ */
 
 /*
@@ -143 +143 @@
     }
 
-    if(pptl[0].x == pptl[1].x || pptl[0].y == pptl[1].y)
-    {
-        return FALSE; // empty rectangle
-    }
-
     if(GetDCData(pHps)->isLeftLeft)
     {