From 152ce17e73ab54e0f619ec2088b34a4a5e53f421 Mon Sep 17 00:00:00 2001 From: Robin Watts Date: Thu, 1 Mar 2012 14:45:44 +0000 Subject: Remove mask entry from fz_pixmap as never used any more. Also, the attempts to keep it up to date were causing race conditions in multithreading cases. --- pdf/pdf_colorspace.c | 2 -- pdf/pdf_image.c | 6 ------ 2 files changed, 8 deletions(-) (limited to 'pdf') diff --git a/pdf/pdf_colorspace.c b/pdf/pdf_colorspace.c index 0e9423b4..05d0c135 100644 --- a/pdf/pdf_colorspace.c +++ b/pdf/pdf_colorspace.c @@ -210,8 +210,6 @@ pdf_expand_indexed_pixmap(fz_context *ctx, fz_pixmap *src) } } - if (src->mask) - dst->mask = fz_keep_pixmap(ctx, src->mask); dst->interpolate = src->interpolate; return dst; diff --git a/pdf/pdf_image.c b/pdf/pdf_image.c index cd2726a5..1702cd30 100644 --- a/pdf/pdf_image.c +++ b/pdf/pdf_image.c @@ -111,7 +111,6 @@ decomp_image_from_stream(fz_context *ctx, fz_stream *stm, pdf_image *image, int fz_try(ctx) { tile = fz_new_pixmap(ctx, image->base.colorspace, w, h); - tile->mask = fz_image_to_pixmap(ctx, image->base.mask, w, h); tile->interpolate = image->interpolate; stride = (w * image->n * image->bpc + 7) / 8; @@ -250,11 +249,6 @@ pdf_image_get_pixmap(fz_context *ctx, fz_image *image_, int w, int h) tile = image->tile; if (!tile) return NULL; - if (image->base.mask) - { - fz_drop_pixmap(ctx, tile->mask); - tile->mask = fz_image_to_pixmap(ctx, image->base.mask, w, h); - } return fz_keep_pixmap(ctx, tile); /* That's all we can give you! */ } -- cgit v1.2.3