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 2023/06/03 10:25:40 UTC
svn commit: r1910198 - /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType2.java
Author: tilman
Date: Sat Jun 3 10:25:40 2023
New Revision: 1910198
URL: http://svn.apache.org/viewvc?rev=1910198&view=rev
Log:
PDFBOX-5612: revert, avoid NPE by throwing exception
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=1910198&r1=1910197&r2=1910198&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 Sat Jun 3 10:25:40 2023
@@ -154,15 +154,21 @@ public class PDCIDFontType2 extends PDCI
else
{
ttfFont = (TrueTypeFont) mapping.getTrueTypeFont();
+ if (ttfFont == null)
+ {
+ // shouldn't happen?!
+ throw new IOException("mapping.getTrueTypeFont() returns null, please report");
+ }
}
- String name = ttfFont == null ? "(null)" : ttfFont.getName();
if (mapping.isFallback())
{
- LOG.warn("Using fallback font " + name + " for CID-keyed TrueType font " + getBaseFont());
+ LOG.warn("Using fallback font " + ttfFont.getName() +
+ " for CID-keyed TrueType font " + getBaseFont());
}
- else if (ttfFont != null)
+ else
{
- LOG.info("Using substitute font " + name + " for CID-keyed TrueType font " + getBaseFont());
+ LOG.info("Using substitute font " + ttfFont.getName() +
+ " for CID-keyed TrueType font " + getBaseFont());
}
return ttfFont;
}