From a5b456c591ec07d36e9cc0b1bd3c3d5a5dc1eb56 Mon Sep 17 00:00:00 2001 From: Vincent Povirk Date: Thu, 15 Apr 2010 15:26:15 -0500 Subject: [PATCH 5/6] 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 c3dfdbe..527c193 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) { -- 1.6.3.3