gdiplus: Process a row instead of a column in inner conversion loop.

3fc386fc · Vincent Povirk · Alexandre Julliard · 2eeffe8a · 3fc386fc
Commit 3fc386fc authored Sep 18, 2014 by Vincent Povirk Committed by Alexandre Julliard Sep 22, 2014
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 6 deletions

image.c dlls/gdiplus/image.c +6 -6

No files found.
--- a/dlls/gdiplus/image.c
+++ b/dlls/gdiplus/image.c
@@ -582,8 +582,8 @@ GpStatus convert_pixels(INT width, INT height,
    }
 #define convert_indexed_to_rgb(getpixel_function, setpixel_function) do { \
-    for (x=0; x<width; x++) \
+    for (y=0; y<height; y++) \
-        for (y=0; y<height; y++) { \
+        for (x=0; x<width; x++) { \
            BYTE index; \
            ARGB argb; \
            BYTE *color = (BYTE *)&argb; \
@@ -595,8 +595,8 @@ GpStatus convert_pixels(INT width, INT height,
 } while (0);
 #define convert_rgb_to_rgb(getpixel_function, setpixel_function) do { \
-    for (x=0; x<width; x++) \
+    for (y=0; y<height; y++) \
-        for (y=0; y<height; y++) { \
+        for (x=0; x<width; x++) { \
            BYTE r, g, b, a; \
            getpixel_function(&r, &g, &b, &a, src_bits+src_stride*y, x); \
            setpixel_function(r, g, b, a, dst_bits+dst_stride*y, x); \
@@ -605,8 +605,8 @@ GpStatus convert_pixels(INT width, INT height,
 } while (0);
 #define convert_rgb_to_indexed(getpixel_function, setpixel_function) do { \
-    for (x=0; x<width; x++) \
+    for (y=0; y<height; y++) \
-        for (y=0; y<height; y++) { \
+        for (x=0; x<width; x++) { \
            BYTE r, g, b, a; \
            getpixel_function(&r, &g, &b, &a, src_bits+src_stride*y, x); \
            setpixel_function(r, g, b, a, dst_bits+dst_stride*y, x, palette); \