diff options
| author | Robin Watts <robin.watts@artifex.com> | 2012-03-01 14:45:44 +0000 |
|---|---|---|
| committer | Robin Watts <robin@ghostscript.com> | 2012-03-01 15:30:34 +0000 |
| commit | 152ce17e73ab54e0f619ec2088b34a4a5e53f421 (patch) | |
| tree | b21b10da8047e69c18fbe73dc6c83fd2b6a833fb /pdf | |
| parent | 2ec4dae7c4c1b91f15651573988e8eadf26a81a0 (diff) | |
| download | mupdf-152ce17e73ab54e0f619ec2088b34a4a5e53f421.tar.xz | |
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.
Diffstat (limited to 'pdf')
| -rw-r--r-- | pdf/pdf_colorspace.c | 2 | ||||
| -rw-r--r-- | pdf/pdf_image.c | 6 |
2 files changed, 0 insertions, 8 deletions
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! */ } |