From 93923c626f2df18e29e215410e6d4bb2f5c1616f Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=B8ren=20Sandmann=20Pedersen?= Date: Mon, 10 Aug 2009 20:47:36 -0400 Subject: [PATCH] Fix x/y mixup in bits_image_fetch_pixel_convolution() MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Bug 23224, reported by Michel Dänzer. --- pixman/pixman-bits-image.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pixman/pixman-bits-image.c b/pixman/pixman-bits-image.c index 9e1ee13..6b80189 100644 --- a/pixman/pixman-bits-image.c +++ b/pixman/pixman-bits-image.c @@ -131,7 +131,7 @@ get_pixel (bits_image_t *image, int x, int y, pixman_bool_t check_bounds) { return 0; } - + return image->fetch_pixel_32 (image, x, y); } @@ -274,20 +274,20 @@ bits_image_fetch_pixel_convolution (bits_image_t *image, { for (j = x1; j < x2; ++j) { - int rx = i; - int ry = j; + int rx = j; + int ry = i; pixman_fixed_t f = *params; - + if (f) { uint32_t pixel; - + if (repeat_mode != PIXMAN_REPEAT_NONE) { repeat (repeat_mode, width, &rx); repeat (repeat_mode, height, &ry); - + pixel = get_pixel (image, rx, ry, FALSE); } else @@ -746,6 +746,7 @@ pixman_image_create_bits (pixman_format_code_t format, { if (free_me) free (free_me); + return NULL; } -- 2.7.4