summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Andersson <tor@ghostscript.com>2009-12-02 18:04:39 +0100
committerTor Andersson <tor@ghostscript.com>2009-12-02 18:04:39 +0100
commitca0c2ce9056227051fe23625e45c00de94ecbb9b (patch)
treed13ef6f56d9aa533a1e2fed6e2662bbe15c6c398
parentc25a1ced8abb1c14e6f3673fe3419963243a1c85 (diff)
downloadmupdf-ca0c2ce9056227051fe23625e45c00de94ecbb9b.tar.xz
Warn and drop soft mask if an image has both Mask and SMask set.
-rw-r--r--mupdf/pdf_image.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/mupdf/pdf_image.c b/mupdf/pdf_image.c
index 32cb1b4b..77fdafaf 100644
--- a/mupdf/pdf_image.c
+++ b/mupdf/pdf_image.c
@@ -335,6 +335,12 @@ pdf_loadimage(pdf_image **imgp, pdf_xref *xref, fz_obj *dict)
else
{
pdf_logimage("has mask\n");
+ if (mask)
+ {
+ fz_warn("image has both a mask and a soft mask. ignoring the soft mask.");
+ pdf_dropimage(mask);
+ mask = nil;
+ }
error = pdf_loadimage(&mask, xref, obj);
if (error)
return error;