Changeset 9355 for trunk/src/gdi32/blit.cpp

Timestamp:

Oct 28, 2002, 1:21:51 PM (23 years ago)

Author:

sandervl

Message:

PF: StretchDIBits fix for partial blits & RGB conversion

File:

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

trunk/src/gdi32/blit.cpp

@@ -1 @@
-/* $Id: blit.cpp,v 1.39 2002-07-15 10:02:28 sandervl Exp $ */
+/* $Id: blit.cpp,v 1.40 2002-10-28 12:21:51 sandervl Exp $ */
 
 /*
@@ -186 +186 @@
              RGB555to565MMX(newbits, (WORD *)bits, imgsize/sizeof(WORD));
         }
-        else RGB555to565(newbits, (WORD *)bits, imgsize/sizeof(WORD));
+        else
+          RGB555to565(newbits, (WORD *)bits, imgsize/sizeof(WORD));
         bits = newbits;
     }
@@ -535 +536 @@
         dprintf(("RGB 555->565 conversion required %x %x %x", bitfields[0], bitfields[1], bitfields[2]));
 
-        int imgsize = CalcBitmapSize(info->bmiHeader.biBitCount,
-                                     info->bmiHeader.biWidth, info->bmiHeader.biHeight);
-
-        newbits = (WORD *)malloc(imgsize);
+        ULONG imgsize = CalcBitmapSize(info->bmiHeader.biBitCount,
+                                     widthSrc, heightSrc);
+        ULONG offset = CalcBitmapSize(info->bmiHeader.biBitCount,
+                                     xSrc, ySrc)/sizeof(WORD);
+        newbits = (WORD *) HeapAlloc(GetProcessHeap(), 0, imgsize);
         if(CPUFeatures & CPUID_MMX) {
-             RGB555to565MMX(newbits, (WORD *)bits, imgsize/sizeof(WORD));
-        }
-        else RGB555to565(newbits, (WORD *)bits, imgsize/sizeof(WORD));
+             RGB555to565MMX(newbits, (WORD *)bits+offset, imgsize/sizeof(WORD));
+        }
+        else 
+          RGB555to565(newbits, (WORD *)bits+offset, imgsize/sizeof(WORD));
         bits = newbits;
     }
@@ -558 +561 @@
         ((BITMAPINFO *)info)->bmiHeader.biCompression = BI_BITFIELDS;
     }
-    if(newbits) free(newbits);
+    if(newbits) HeapFree(GetProcessHeap(), 0, newbits);
 
     //Open32 always returns height of bitmap (regardless of how many scanlines were copied)