Vincent Povirk : gdiplus: Always use software to draw bitmaps to bitmaps.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 8b2543b7503e7bb1b7db1d3a32cad88d70cf3e6e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=8b2543b7503e7bb1b7db1d3a32...

Author: Vincent Povirk 
Date:   Thu Apr 15 15:26:15 2010 -0500

gdiplus: Always use software to draw bitmaps to bitmaps.

---

dlls/gdiplus/graphics.c |    9 +--------
 1 files changed, 1 insertions(+), 8 deletions(-)

diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c
index 8efa128..94623db 100644
--- a/dlls/gdiplus/graphics.c
+++ b/dlls/gdiplus/graphics.c
@@ -1996,16 +1996,9 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image
             return NotImplemented;

if (imageAttributes ||
+            (graphics->image && graphics->image->type == ImageTypeBitmap) ||
             ptf[1].Y != ptf[0].Y || ptf[2].X != ptf[0].X)
             use_software = 1;
-        else if (graphics->image && graphics->image->type == ImageTypeBitmap)
-        {
-            GpBitmap *dst_bitmap = (GpBitmap*)graphics->image;
-            if (!(dst_bitmap->format == PixelFormat16bppRGB555 ||
-                  dst_bitmap->format == PixelFormat24bppRGB ||
-                  dst_bitmap->format == PixelFormat32bppRGB))
-                use_software = 1;
-        }

if (use_software)
         {