You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@pdfbox.apache.org by ti...@apache.org on 2015/11/12 18:49:16 UTC

svn commit: r1714100 - /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/PDImageXObject.java

Author: tilman
Date: Thu Nov 12 17:49:16 2015
New Revision: 1714100

URL: http://svn.apache.org/viewvc?rev=1714100&view=rev
Log:
PDFBOX-3105: apply mask only if /ImageMask true

Modified:
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/PDImageXObject.java

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/PDImageXObject.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/PDImageXObject.java?rev=1714100&r1=1714099&r2=1714100&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/PDImageXObject.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/PDImageXObject.java Thu Nov 12 17:49:16 2015
@@ -282,9 +282,9 @@ public final class PDImageXObject extend
         }
         else
         {
-            // explicit mask
+            // explicit mask - to be applied only if /ImageMask true
             PDImageXObject mask = getMask();
-            if (mask != null)
+            if (mask != null && mask.isStencil())
             {
                 image = applyMask(image, mask.getOpaqueImage(), false);
             }