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 2017/09/20 16:08:23 UTC
svn commit: r1809046 -
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType2.java
Author: tilman
Date: Wed Sep 20 16:08:23 2017
New Revision: 1809046
URL: http://svn.apache.org/viewvc?rev=1809046&view=rev
Log:
PDFBOX-2852: split long method
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType2.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType2.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType2.java?rev=1809046&r1=1809045&r2=1809046&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType2.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType2.java Wed Sep 20 16:08:23 2017
@@ -142,24 +142,7 @@ public class PDCIDFontType2 extends PDCI
if (ttfFont == null)
{
- // find font or substitute
- CIDFontMapping mapping = FontMappers.instance()
- .getCIDFont(getBaseFont(), getFontDescriptor(),
- getCIDSystemInfo());
-
- if (mapping.isCIDFont())
- {
- ttfFont = mapping.getFont();
- }
- else
- {
- ttfFont = (TrueTypeFont)mapping.getTrueTypeFont();
- }
-
- if (mapping.isFallback())
- {
- LOG.warn("Using fallback font " + ttfFont.getName() + " for CID-keyed TrueType font " + getBaseFont());
- }
+ ttfFont = findFontOrSubstitute();
}
ttf = ttfFont;
}
@@ -167,6 +150,28 @@ public class PDCIDFontType2 extends PDCI
cid2gid = readCIDToGIDMap();
}
+ private TrueTypeFont findFontOrSubstitute() throws IOException
+ {
+ TrueTypeFont ttfFont;
+
+ CIDFontMapping mapping = FontMappers.instance()
+ .getCIDFont(getBaseFont(), getFontDescriptor(),
+ getCIDSystemInfo());
+ if (mapping.isCIDFont())
+ {
+ ttfFont = mapping.getFont();
+ }
+ else
+ {
+ ttfFont = (TrueTypeFont)mapping.getTrueTypeFont();
+ }
+ if (mapping.isFallback())
+ {
+ LOG.warn("Using fallback font " + ttfFont.getName() + " for CID-keyed TrueType font " + getBaseFont());
+ }
+ return ttfFont;
+ }
+
@Override
public Matrix getFontMatrix()
{