PDFBOX-4627, PDFBOX-5054: ignore color operators in type3 charprocs with d1 or uncolored tiling patterns

git-svn-id: https://svn.apache.org/repos/asf/pdfbox/trunk@1922853 13f79535-47bb-0310-9956-ffa450edef68

Author: THausherr

pdfbox/src/main/java/org/apache/pdfbox/contentstream/PDFStreamEngine.java

@@ -64,6 +64,7 @@
 import org.apache.pdfbox.util.Matrix;
 import org.apache.pdfbox.util.Vector;
 import org.apache.pdfbox.contentstream.operator.Operator;
+import org.apache.pdfbox.contentstream.operator.OperatorName;
 import org.apache.pdfbox.contentstream.operator.OperatorProcessor;
 import org.apache.pdfbox.pdmodel.graphics.blend.BlendMode;
 
@@ -91,7 +92,10 @@ public abstract class PDFStreamEngine
 
     // default font, used if there isn't any font available
     private PDFont defaultFont;
-    
+
+    // false in certain cases, e.g. type3 charprocs with d1 or uncolored tiling patterns
+    private boolean shouldProcessColorOperators;
+
     /**
      * Creates a new PDFStreamEngine.
      */
@@ -524,18 +528,40 @@ private void processStreamOperators(PDContentStream contentStream) throws IOExce
         List<COSBase> arguments = new ArrayList<>();
         PDFStreamParser parser = new PDFStreamParser(contentStream);
         Object token = parser.parseNextToken();
-        while (token != null)
+
+        boolean isFirstOperator = true;
+        boolean oldShouldProcessColorOperators = shouldProcessColorOperators;
+        shouldProcessColorOperators = true;
+        if (contentStream instanceof PDTilingPattern &&
+            ((PDTilingPattern) contentStream).getPaintType() == PDTilingPattern.PAINT_UNCOLORED)
         {
-            if (token instanceof Operator)
-            {
-                processOperator((Operator) token, arguments);
-                arguments.clear();
-            }
-            else
+            shouldProcessColorOperators = false;
+        }
+        try
+        {
+            while (token != null)
             {
-                arguments.add((COSBase) token);
+                if (token instanceof Operator)
+                {
+                    if (isFirstOperator && contentStream instanceof PDType3CharProc && 
+                        OperatorName.TYPE3_D1.equals(((Operator) token).getName()))
+                    {
+                        shouldProcessColorOperators = false;
+                    }
+                    isFirstOperator = false;
+                    processOperator((Operator) token, arguments);
+                    arguments.clear();
+                }
+                else
+                {
+                    arguments.add((COSBase) token);
+                }
+                token = parser.parseNextToken();
             }
-            token = parser.parseNextToken();
+        }
+        finally
+        {
+            shouldProcessColorOperators = oldShouldProcessColorOperators;
         }
     }
 
@@ -1144,4 +1170,9 @@ public void decreaseLevel()
             LOG.error("level is {}", level);
         }
     }
+
+    public boolean isShouldProcessColorOperators()
+    {
+        return shouldProcessColorOperators;
+    }
 }

pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/color/SetNonStrokingColorSpace.java

@@ -53,6 +53,10 @@ public void process(Operator operator, List<COSBase> arguments) throws IOExcepti
             return;
         }
         PDFStreamEngine context = getContext();
+        if (!context.isShouldProcessColorOperators())
+        {
+            return;
+        }
         PDColorSpace cs = context.getResources().getColorSpace((COSName) base);
         context.getGraphicsState().setNonStrokingColorSpace(cs);
         context.getGraphicsState().setNonStrokingColor(cs.getInitialColor());

pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/color/SetNonStrokingDeviceCMYKColor.java

@@ -43,6 +43,10 @@ public SetNonStrokingDeviceCMYKColor(PDFStreamEngine context)
     public void process(Operator operator, List<COSBase> arguments) throws IOException
     {
         PDFStreamEngine context = getContext();
+        if (!context.isShouldProcessColorOperators())
+        {
+            return;
+        }
         PDColorSpace cs = context.getResources().getColorSpace(COSName.DEVICECMYK);
         context.getGraphicsState().setNonStrokingColorSpace(cs);
         super.process(operator, arguments);

pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/color/SetNonStrokingDeviceGrayColor.java

@@ -43,6 +43,10 @@ public SetNonStrokingDeviceGrayColor(PDFStreamEngine context)
     public void process(Operator operator, List<COSBase> arguments) throws IOException
     {
         PDFStreamEngine context = getContext();
+        if (!context.isShouldProcessColorOperators())
+        {
+            return;
+        }
         PDColorSpace cs = context.getResources().getColorSpace(COSName.DEVICEGRAY);
         context.getGraphicsState().setNonStrokingColorSpace(cs);
         super.process(operator, arguments);

pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/color/SetNonStrokingDeviceRGBColor.java

@@ -43,6 +43,10 @@ public SetNonStrokingDeviceRGBColor(PDFStreamEngine context)
     public void process(Operator operator, List<COSBase> arguments) throws IOException
     {
         PDFStreamEngine context = getContext();
+        if (!context.isShouldProcessColorOperators())
+        {
+            return;
+        }
         PDColorSpace cs = context.getResources().getColorSpace(COSName.DEVICERGB);
         context.getGraphicsState().setNonStrokingColorSpace(cs);
         super.process(operator, arguments);

pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/color/SetStrokingColorSpace.java

@@ -53,6 +53,10 @@ public void process(Operator operator, List<COSBase> arguments) throws IOExcepti
             return;
         }
         PDFStreamEngine context = getContext();
+        if (!context.isShouldProcessColorOperators())
+        {
+            return;
+        }
         PDColorSpace cs = context.getResources().getColorSpace((COSName) base);
         context.getGraphicsState().setStrokingColorSpace(cs);
         context.getGraphicsState().setStrokingColor(cs.getInitialColor());

pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/color/SetStrokingDeviceCMYKColor.java

@@ -42,6 +42,10 @@ public SetStrokingDeviceCMYKColor(PDFStreamEngine context)
     public void process(Operator operator, List<COSBase> arguments) throws IOException
     {
         PDFStreamEngine context = getContext();
+        if (!context.isShouldProcessColorOperators())
+        {
+            return;
+        }
         PDColorSpace cs = context.getResources().getColorSpace(COSName.DEVICECMYK);
         context.getGraphicsState().setStrokingColorSpace(cs);
         super.process(operator, arguments);

pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/color/SetStrokingDeviceGrayColor.java

@@ -43,6 +43,10 @@ public SetStrokingDeviceGrayColor(PDFStreamEngine context)
     public void process(Operator operator, List<COSBase> arguments) throws IOException
     {
         PDFStreamEngine context = getContext();
+        if (!context.isShouldProcessColorOperators())
+        {
+            return;
+        }
         PDColorSpace cs = context.getResources().getColorSpace(COSName.DEVICEGRAY);
         context.getGraphicsState().setStrokingColorSpace(cs);
         super.process(operator, arguments);

pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/color/SetStrokingDeviceRGBColor.java

@@ -50,6 +50,10 @@ public SetStrokingDeviceRGBColor(PDFStreamEngine context)
     public void process(Operator operator, List<COSBase> arguments) throws IOException
     {
         PDFStreamEngine context = getContext();
+        if (!context.isShouldProcessColorOperators())
+        {
+            return;
+        }
         PDColorSpace cs = context.getResources().getColorSpace(COSName.DEVICERGB);
         context.getGraphicsState().setStrokingColorSpace(cs);
         super.process(operator, arguments);