You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by le...@apache.org on 2021/08/30 08:57:51 UTC
svn commit: r1892722 -
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/PDFStreamEngine.java
Author: lehmi
Date: Mon Aug 30 08:57:51 2021
New Revision: 1892722
URL: http://svn.apache.org/viewvc?rev=1892722&view=rev
Log:
PDFBOX-5214: replace static standard14font with a newly created one
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/PDFStreamEngine.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/PDFStreamEngine.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/PDFStreamEngine.java?rev=1892722&r1=1892721&r2=1892722&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/PDFStreamEngine.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/PDFStreamEngine.java Mon Aug 30 08:57:51 2021
@@ -49,6 +49,7 @@ import org.apache.pdfbox.pdmodel.font.PD
import org.apache.pdfbox.pdmodel.font.PDType1Font;
import org.apache.pdfbox.pdmodel.font.PDType3CharProc;
import org.apache.pdfbox.pdmodel.font.PDType3Font;
+import org.apache.pdfbox.pdmodel.font.Standard14Fonts.FontName;
import org.apache.pdfbox.pdmodel.graphics.PDLineDashPattern;
import org.apache.pdfbox.pdmodel.graphics.color.PDColor;
import org.apache.pdfbox.pdmodel.graphics.color.PDColorSpace;
@@ -90,6 +91,9 @@ public abstract class PDFStreamEngine
// used to monitor potentially recursive operations.
private int level = 0;
+ // default font, used if there isn't any font available
+ private PDFont defaultFont;
+
/**
* Creates a new PDFStreamEngine.
*/
@@ -127,6 +131,19 @@ public abstract class PDFStreamEngine
}
/**
+ * Provide standard 14 Helvetica font as default if there isn't any font available.
+ * @return the default font
+ */
+ private PDFont getDefaultFont()
+ {
+ if (defaultFont == null)
+ {
+ defaultFont = new PDType1Font(FontName.HELVETICA);
+ }
+ return defaultFont;
+ }
+
+ /**
* This will initialize and process the contents of the stream.
*
* @param page the page to process
@@ -672,7 +689,7 @@ public abstract class PDFStreamEngine
if (font == null)
{
LOG.warn("No current font, will use default");
- font = PDType1Font.HELVETICA;
+ font = getDefaultFont();
}
float fontSize = textState.getFontSize();