diff options
| author | marha <marha@users.sourceforge.net> | 2012-04-10 10:49:59 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-04-10 10:49:59 +0200 |
| commit | c6f80401dc533b04341afe8d596960d1bc25efce (patch) | |
| tree | 2826007946218a8370d2eebc6aa32083618e2bfe /pixman/test/utils.c | |
| parent | 31706e67674f308e3e7f2a8aaf02f1e0a00fbade (diff) | |
| download | vcxsrv-c6f80401dc533b04341afe8d596960d1bc25efce.tar.gz vcxsrv-c6f80401dc533b04341afe8d596960d1bc25efce.tar.bz2 vcxsrv-c6f80401dc533b04341afe8d596960d1bc25efce.zip | |
fontconfig mesa xkeyboard-config xserver pixman git update 10 Apr 2012
Diffstat (limited to 'pixman/test/utils.c')
| -rw-r--r-- | pixman/test/utils.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/pixman/test/utils.c b/pixman/test/utils.c index 379bd71a8..cc0365aa2 100644 --- a/pixman/test/utils.c +++ b/pixman/test/utils.c @@ -340,17 +340,15 @@ make_random_bytes (int n_bytes) return bytes; } -#ifdef HAVE_LIBPNG - -static void -pngify_pixels (uint32_t *pixels, int n_pixels) +void +a8r8g8b8_to_rgba_np (uint32_t *dst, uint32_t *src, int n_pixels) { + uint8_t *dst8 = (uint8_t *)dst; int i; for (i = 0; i < n_pixels; ++i) { - uint32_t p = pixels[i]; - uint8_t *out = (uint8_t *)&(pixels[i]); + uint32_t p = src[i]; uint8_t a, r, g, b; a = (p & 0xff000000) >> 24; @@ -365,13 +363,15 @@ pngify_pixels (uint32_t *pixels, int n_pixels) b = (b * 255) / a; } - *out++ = r; - *out++ = g; - *out++ = b; - *out++ = a; + *dst8++ = r; + *dst8++ = g; + *dst8++ = b; + *dst8++ = a; } } +#ifdef HAVE_LIBPNG + pixman_bool_t write_png (pixman_image_t *image, const char *filename) { @@ -398,7 +398,7 @@ write_png (pixman_image_t *image, const char *filename) pixman_image_composite32 ( PIXMAN_OP_SRC, image, NULL, copy, 0, 0, 0, 0, 0, 0, width, height); - pngify_pixels (data, height * width); + a8r8g8b8_to_rgba_np (data, data, height * width); for (i = 0; i < height; ++i) row_pointers[i] = (png_bytep)(data + i * width); |