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

Timestamp:

Jul 16, 2003, 12:46:18 PM (22 years ago)

Author:

sandervl

Message:

DT: Fix for partial blits in StretchDIBits; optimized rgb conversion calls

File:

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

trunk/src/gdi32/blit.cpp

@@ -1 @@
-/* $Id: blit.cpp,v 1.44 2003-05-02 15:32:27 sandervl Exp $ */
+/* $Id: blit.cpp,v 1.45 2003-07-16 10:46:16 sandervl Exp $ */
 
 /*
@@ -183 +183 @@
 
         newbits = (WORD *)malloc(imgsize);
-        if(CPUFeatures & CPUID_MMX) {
-             RGB555to565MMX(newbits, (WORD *)bits, imgsize/sizeof(WORD));
-        }
-        else
-          RGB555to565(newbits, (WORD *)bits, imgsize/sizeof(WORD));
+        pRGB555to565(newbits, (WORD *)bits, imgsize/sizeof(WORD));
         bits = newbits;
     }
@@ -469 +465 @@
         break;
     }
+
     if(bitfields[1] == RGB555_GREEN_MASK) 
     {//RGB 555?
@@ -474 +471 @@
 
         ULONG imgsize = CalcBitmapSize(info->bmiHeader.biBitCount,
-                                     widthSrc, heightSrc);
+                                     abs(info->bmiHeader.biWidth), heightSrc);
         ULONG offset = CalcBitmapSize(info->bmiHeader.biBitCount,
-                                     xSrc, ySrc)/sizeof(WORD);
+                                     abs(info->bmiHeader.biWidth), ySrc)/sizeof(WORD);
         newbits = (WORD *) HeapAlloc(GetProcessHeap(), 0, imgsize);
-//bugbug (too much)
-//bugbug
-        if(CPUFeatures & CPUID_MMX) {
-             RGB555to565MMX(newbits, (WORD *)bits+offset, imgsize/sizeof(WORD));
-        }
-        else 
-          RGB555to565(newbits, (WORD *)bits+offset, imgsize/sizeof(WORD));
+
+        //we still convert too much
+        pRGB555to565(newbits, (WORD *)bits+offset, imgsize/sizeof(WORD));
         bits = newbits;
+
+        ySrc = 0;
     }
     //SvL: Ignore BI_BITFIELDS type (StretchDIBits fails otherwise)