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 2021/10/12 09:21:35 UTC
svn commit: r1894158 -
/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType3CharProc.java
Author: tilman
Date: Tue Oct 12 09:21:34 2021
New Revision: 1894158
URL: http://svn.apache.org/viewvc?rev=1894158&view=rev
Log:
PDFBOX-5294: use resources in the charproc entry, as suggested by Daniel Persson
Modified:
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType3CharProc.java
Modified: pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType3CharProc.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType3CharProc.java?rev=1894158&r1=1894157&r2=1894158&view=diff
==============================================================================
--- pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType3CharProc.java (original)
+++ pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType3CharProc.java Tue Oct 12 09:21:34 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.pdfparser.PDFStreamParser;
@@ -40,6 +44,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;
@@ -74,6 +80,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();
}