svn commit: r1894159 - /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType3CharProc.java

[ti...@apache.org]

Author: tilman
Date: Tue Oct 12 09:21:38 2021
New Revision: 1894159

URL: http://svn.apache.org/viewvc?rev=1894159&view=rev
Log:
PDFBOX-5294: use resources in the charproc entry, as suggested by Daniel Persson

Modified:
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType3CharProc.java

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType3CharProc.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType3CharProc.java?rev=1894159&r1=1894158&r2=1894159&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType3CharProc.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType3CharProc.java Tue Oct 12 09:21:38 2021
@@ -21,9 +21,13 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.pdfbox.contentstream.PDContentStream;
 import org.apache.pdfbox.contentstream.operator.Operator;
 import org.apache.pdfbox.cos.COSBase;
+import org.apache.pdfbox.cos.COSDictionary;
+import org.apache.pdfbox.cos.COSName;
 import org.apache.pdfbox.cos.COSNumber;
 import org.apache.pdfbox.cos.COSStream;
 import org.apache.pdfbox.io.RandomAccessRead;
@@ -41,6 +45,8 @@ import org.apache.pdfbox.util.Matrix;
  */
 public final class PDType3CharProc implements COSObjectable, PDContentStream
 {
+    private static final Log LOG = LogFactory.getLog(PDType3CharProc.class);
+
     private final PDType3Font font;
     private final COSStream charStream;
 
@@ -81,6 +87,13 @@ public final class PDType3CharProc imple
     @Override
     public PDResources getResources()
     {
+        if (charStream.containsKey(COSName.RESOURCES))
+        {
+            // PDFBOX-5294
+            LOG.warn("Using resources dictionary found in charproc entry");
+            LOG.warn("This should have been in the font or in the page dictionary");
+            return new PDResources((COSDictionary) charStream.getDictionaryObject(COSName.RESOURCES));
+        }
         return font.getResources();
     }