Changeset 4681 for trunk/src

Timestamp:

Nov 23, 2000, 8:23:01 PM (25 years ago)

Author:

sandervl

Message:

SetDIBits fix for compressed bitmaps

Location:

trunk/src/gdi32

Files:

• dibsect.cpp (modified) (4 diffs)
• gdi32rsrc.orc (modified) (2 diffs)

trunk/src/gdi32/dibsect.cpp

@@ -1 @@
-/* $Id: dibsect.cpp,v 1.42 2000-11-09 18:16:56 sandervl Exp $ */
+/* $Id: dibsect.cpp,v 1.43 2000-11-23 19:23:01 sandervl Exp $ */
 
 /*
@@ -108 +108 @@
    pOS2bmp->cPlanes       = pbmi->biPlanes;
    pOS2bmp->cBitCount     = pbmi->biBitCount;
-   pOS2bmp->ulCompression = pbmi->biCompression;
+   pOS2bmp->ulCompression = pbmi->biCompression; //same as OS/2 (uncompressed, rle8, rle4)
    //SvL: Ignore BI_BITFIELDS_W type (GpiDrawBits fails otherwise)
    if(pOS2bmp->ulCompression == BI_BITFIELDS_W) {
@@ -297 +297 @@
    pOS2bmp->cPlanes       = pbmi->biPlanes;
    pOS2bmp->cBitCount     = pbmi->biBitCount;
-   pOS2bmp->ulCompression = pbmi->biCompression;
+   pOS2bmp->ulCompression = pbmi->biCompression; //same as OS/2 (uncompressed, rle8, rle4)
+   //SvL: Ignore BI_BITFIELDS_W type (GpiDrawBits fails otherwise)
+   if(pOS2bmp->ulCompression == BI_BITFIELDS_W) {
+        pOS2bmp->ulCompression = 0;
+   }
    pOS2bmp->cbImage       = pbmi->biSizeImage;
 
@@ -364 +368 @@
    if(bits)
    {
-      int size = bmpsize*lines;
-      memcpy(bmpBits+bmpsize*startscan, bits, size);
+      if(pOS2bmp->ulCompression == BCA_UNCOMP) {
+          int size = bmpsize*lines;
+          memcpy(bmpBits+bmpsize*startscan, bits, size);
+      }
+      else {
+          dprintf(("Compressed image!!"));
+          if(startscan != 0) {
+               dprintf(("WARNING: Compressed image & startscan != 0!!!!"));
+          }
+          memcpy(bmpBits, bits, pbmi->biSizeImage);
+      }
    }
    return(lines);

trunk/src/gdi32/gdi32rsrc.orc

@@ -1 @@
-/* $Id: gdi32rsrc.orc,v 1.2 2000-08-19 13:01:07 sandervl Exp $ */
+/* $Id: gdi32rsrc.orc,v 1.3 2000-11-23 19:23:01 sandervl Exp $ */
 
 #include "winuser.h"
@@ -28 +28 @@
             VALUE "FileVersion", "4.00\0"
             VALUE "InternalName", "GDI32\0"
-            VALUE "LegalCopyright", "Copyright (C) 1999\0"
+            VALUE "LegalCopyright", "Copyright (C) 2000\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "GDI32.DLL\0"