From d53ab7a97c018aaa0e0adcaabcebcc72c080f724 Mon Sep 17 00:00:00 2001 From: Sebastian Rasmussen Date: Sat, 29 Oct 2016 15:53:58 +0800 Subject: Let pixmap colorspace conversion create new pixmap. This moves dropping the converted pixmap into fz_convert_pixmap(), which relieves every caller from doing so. Moreover resolution, position and interpolation are kept. --- source/fitz/load-jxr.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'source/fitz/load-jxr.c') diff --git a/source/fitz/load-jxr.c b/source/fitz/load-jxr.c index e61d6e7a..8bff2833 100644 --- a/source/fitz/load-jxr.c +++ b/source/fitz/load-jxr.c @@ -413,19 +413,7 @@ fz_load_jxr(fz_context *ctx, unsigned char *data, size_t size) /* CMYK is a subtractive colorspace, we want additive for premul alpha */ if (info.comps >= 4) { - fz_pixmap *rgb = fz_new_pixmap(ctx, fz_device_rgb(ctx), image->w, image->h, 1); - - rgb->xres = image->xres; - rgb->yres = image->yres; - - fz_try(ctx) - fz_convert_pixmap(ctx, rgb, image); - fz_catch(ctx) - { - fz_drop_pixmap(ctx, rgb); - fz_rethrow(ctx); - } - + fz_pixmap *rgb = fz_convert_pixmap(ctx, image, fz_device_rgb(ctx), 1); fz_drop_pixmap(ctx, image); image = rgb; } -- cgit v1.2.3