You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ja...@apache.org on 2014/08/28 20:19:23 UTC
svn commit: r1621175 -
/pdfbox/branches/no-awt/fontbox/src/main/java/org/apache/fontbox/ttf/TrueTypeFont.java
Author: jahewson
Date: Thu Aug 28 18:19:22 2014
New Revision: 1621175
URL: http://svn.apache.org/r1621175
Log:
PDFBOX-2262: Allow getNaming()to be null in TTF
Modified:
pdfbox/branches/no-awt/fontbox/src/main/java/org/apache/fontbox/ttf/TrueTypeFont.java
Modified: pdfbox/branches/no-awt/fontbox/src/main/java/org/apache/fontbox/ttf/TrueTypeFont.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/no-awt/fontbox/src/main/java/org/apache/fontbox/ttf/TrueTypeFont.java?rev=1621175&r1=1621174&r2=1621175&view=diff
==============================================================================
--- pdfbox/branches/no-awt/fontbox/src/main/java/org/apache/fontbox/ttf/TrueTypeFont.java (original)
+++ pdfbox/branches/no-awt/fontbox/src/main/java/org/apache/fontbox/ttf/TrueTypeFont.java Thu Aug 28 18:19:22 2014
@@ -369,7 +369,14 @@ public class TrueTypeFont implements Typ
@Override
public String getFullName() throws IOException
{
- return getNaming().getPostScriptName();
+ if (getNaming() != null)
+ {
+ return getNaming().getPostScriptName();
+ }
+ else
+ {
+ return null;
+ }
}
private synchronized void readPostScriptNames() throws IOException
@@ -473,11 +480,18 @@ public class TrueTypeFont implements Typ
{
try
{
- return getNaming().getPostScriptName();
+ if (getNaming() != null)
+ {
+ return getNaming().getPostScriptName();
+ }
+ else
+ {
+ return "(null)";
+ }
}
catch (IOException e)
{
- return "(null)";
+ return "(null - " + e.getMessage() + ")";
}
}
}