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 2024/12/31 12:29:28 UTC

svn commit: r1922800 - /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java

Author: tilman
Date: Tue Dec 31 12:29:28 2024
New Revision: 1922800

URL: http://svn.apache.org/viewvc?rev=1922800&view=rev
Log:
PDFBOX-5307: for images that include SMask/Mask entries, ignore an SMask defined in the current graphics state, as done by SehoAhn and Jonas Jenwald in PDF.js PR 19269

Modified:
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java?rev=1922800&r1=1922799&r2=1922800&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java Tue Dec 31 12:29:28 2024
@@ -1238,7 +1238,7 @@ public class PageDrawer extends PDFGraph
                 BufferedImage image = pdImage.getStencilImage(getNonStrokingPaint());
 
                 // draw the image
-                drawBufferedImage(image, at);
+                drawBufferedImage(pdImage, image, at);
             }
         }
         else
@@ -1247,12 +1247,12 @@ public class PageDrawer extends PDFGraph
             {
                 int subsampling = getSubsampling(pdImage, at);
                 // draw the subsampled image
-                drawBufferedImage(pdImage.getImage(null, subsampling), at);
+                drawBufferedImage(pdImage, pdImage.getImage(null, subsampling), at);
             }
             else
             {
                 // subsampling not allowed, draw the image
-                drawBufferedImage(pdImage.getImage(), at);
+                drawBufferedImage(pdImage, pdImage.getImage(), at);
             }
         }
 
@@ -1296,7 +1296,7 @@ public class PageDrawer extends PDFGraph
         return subsampling;
     }
 
-    private void drawBufferedImage(BufferedImage image, AffineTransform at) throws IOException
+    private void drawBufferedImage(PDImage pdImage, BufferedImage image, AffineTransform at) throws IOException
     {
         AffineTransform originalTransform = graphics.getTransform();
         AffineTransform imageTransform = new AffineTransform(at);
@@ -1306,7 +1306,15 @@ public class PageDrawer extends PDFGraph
         imageTransform.translate(0, -height);
 
         PDSoftMask softMask = getGraphicsState().getSoftMask();
-        if( softMask != null )
+
+        // PDFBOX-5307 / PDF.js PR#19269
+        // From section 11.6.4.3 Mask Shape and Opacity in the PDF specification:
+        // "Either form of mask in the image dictionary shall override the current soft mask
+        //  in the graphics state"
+        boolean hasImageMask = pdImage.getCOSObject().containsKey(COSName.MASK) ||
+                               pdImage.getCOSObject().containsKey(COSName.SMASK);
+
+        if (softMask != null && !hasImageMask)
         {
             Rectangle2D rectangle = new Rectangle2D.Float(0, 0, width, height);
             Paint awtPaint = new TexturePaint(image, rectangle);