diff options
Diffstat (limited to 'pixman/pixman/pixman-bits-image.c')
| -rw-r--r-- | pixman/pixman/pixman-bits-image.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/pixman/pixman/pixman-bits-image.c b/pixman/pixman/pixman-bits-image.c index 5a5a69057..23a379633 100644 --- a/pixman/pixman/pixman-bits-image.c +++ b/pixman/pixman/pixman-bits-image.c @@ -115,12 +115,13 @@ bits_image_fetch_pixel_alpha (bits_image_t *image, int x, int y) } else { - pixel_a = image->fetch_pixel_raw_32 ( + pixel_a = image->common.alpha_map->fetch_pixel_raw_32 ( image->common.alpha_map, x, y); pixel_a = ALPHA_8 (pixel_a); } - UN8x4_MUL_UN8 (pixel, pixel_a); + pixel &= 0x00ffffff; + pixel |= (pixel_a << 24); return pixel; } @@ -1043,6 +1044,12 @@ pixman_image_create_bits (pixman_format_code_t format, return_val_if_fail (bits == NULL || (rowstride_bytes % sizeof (uint32_t)) == 0, NULL); + if (PIXMAN_FORMAT_BPP (format) < PIXMAN_FORMAT_DEPTH (format)) + { + fprintf (stderr, "Bad format passed to pixman_image_create_bits();\n"); + return NULL; + } + if (!bits && width && height) { free_me = bits = create_bits (format, width, height, &rowstride_bytes); |