PDFBOX-4627, PDFBOX-5054: ignore non-stencil images in type3 charproc…

…s with d1 or uncolored tiling patterns git-svn-id: https://svn.apache.org/repos/asf/pdfbox/trunk@1922858 13f79535-47bb-0310-9956-ffa450edef68
apache · Jan 3, 2025 · 02d02d1 · 02d02d1
1 parent 8f806dd
commit 02d02d1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/BeginInlineImage.java b/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/BeginInlineImage.java
@@ -54,6 +54,10 @@ public void process(Operator operator, List<COSBase> operands) throws IOExceptio
         {
             return;
         }
+        if (!image.isStencil() && !context.isShouldProcessColorOperators())
+        {
+            return;
+        }
         context.drawImage(image);
     }
 

diff --git a/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/DrawObject.java b/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/DrawObject.java
@@ -70,7 +70,11 @@ public void process(Operator operator, List<COSBase> operands) throws IOExceptio
         }
         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)
-Original file line number
+Diff line change
@@ Expand Up @@
             {
                 return;
             }
+            if (!image.isStencil() && !context.isShouldProcessColorOperators())
+            {
+                return;
+            }
             context.drawImage(image);
         }
@@ Expand Down @@