Vincent Povirk : gdiplus: Apply image attributes to bitmaps before resampling them.

[Alexandre Julliard]

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

Author: Vincent Povirk 
Date:   Wed Mar  9 17:49:48 2011 -0600

gdiplus: Apply image attributes to bitmaps before resampling them.

---

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

diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c
index 7b51c61..7a70f36 100644
--- a/dlls/gdiplus/graphics.c
+++ b/dlls/gdiplus/graphics.c
@@ -2488,6 +2488,10 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image
                 return OutOfMemory;
             }

+            apply_image_attributes(imageAttributes, src_data,
+                src_area.Width, src_area.Height,
+                src_stride, ColorAdjustTypeBitmap);
+
             /* Transform the bits as needed to the destination. */
             GdipTransformMatrixPoints(dst_to_src, dst_to_src_points, 3);

@@ -2523,11 +2527,6 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image

GdipFree(src_data);

-            apply_image_attributes(imageAttributes, dst_data,
-                dst_area.right - dst_area.left,
-                dst_area.bottom - dst_area.top,
-                dst_stride, ColorAdjustTypeBitmap);
-
             stat = alpha_blend_pixels(graphics, dst_area.left, dst_area.top,
                 dst_data, dst_area.right - dst_area.left, dst_area.bottom - dst_area.top, dst_stride);