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 2025/01/03 11:21:13 UTC

svn commit: r1922857 - in /pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics: BeginInlineImage.java DrawObject.java

Author: tilman
Date: Fri Jan  3 11:21:13 2025
New Revision: 1922857

URL: http://svn.apache.org/viewvc?rev=1922857&view=rev
Log:
PDFBOX-4627, PDFBOX-5054: ignore non-stencil images in type3 charprocs with d1 or uncolored tiling patterns

Modified:
    pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/BeginInlineImage.java
    pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/DrawObject.java

Modified: pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/BeginInlineImage.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/BeginInlineImage.java?rev=1922857&r1=1922856&r2=1922857&view=diff
==============================================================================
--- pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/BeginInlineImage.java (original)
+++ pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/BeginInlineImage.java Fri Jan  3 11:21:13 2025
@@ -54,6 +54,10 @@ public final class BeginInlineImage exte
         {
             return;
         }
+        if (!image.isStencil() && !context.isShouldProcessColorOperators())
+        {
+            return;
+        }
         context.drawImage(image);
     }
 

Modified: pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/DrawObject.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/DrawObject.java?rev=1922857&r1=1922856&r2=1922857&view=diff
==============================================================================
--- pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/DrawObject.java (original)
+++ pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/DrawObject.java Fri Jan  3 11:21:13 2025
@@ -70,7 +70,11 @@ public final class DrawObject extends Gr
         }
         else if (xobject instanceof PDImageXObject)
         {
-            PDImageXObject image = (PDImageXObject)xobject;
+            PDImageXObject image = (PDImageXObject) xobject;
+            if (!image.isStencil() && !context.isShouldProcessColorOperators())
+            {
+                return;
+            }
             context.drawImage(image);
         }
         else if (xobject instanceof PDFormXObject)