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/07/01 04:37:05 UTC
svn commit: r1606967 - in /pdfbox/trunk:
fontbox/src/main/java/org/apache/fontbox/util/FontManager.java
pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDResources.java
Author: jahewson
Date: Tue Jul 1 02:37:04 2014
New Revision: 1606967
URL: http://svn.apache.org/r1606967
Log:
PDFBOX-2169: improve error for missing standard font
Modified:
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/util/FontManager.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDResources.java
Modified: pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/util/FontManager.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/util/FontManager.java?rev=1606967&r1=1606966&r2=1606967&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/util/FontManager.java (original)
+++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/util/FontManager.java Tue Jul 1 02:37:04 2014
@@ -369,7 +369,7 @@ public class FontManager
if (standardFont == null)
{
- throw new IOException("Could not load TTF fallback font");
+ throw new IOException("Could not find TTF fallback font on the system");
}
}
return standardFont;
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDResources.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDResources.java?rev=1606967&r1=1606966&r2=1606967&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDResources.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDResources.java Tue Jul 1 02:37:04 2014
@@ -181,7 +181,7 @@ public class PDResources implements COSO
*
* @return The map of fonts.
*/
- public Map<String, PDFont> getFonts()
+ public Map<String, PDFont> getFonts() throws IOException
{
if (fonts == null)
{
@@ -203,19 +203,8 @@ public class PDResources implements COSO
// PDF, we will just ignore entries that are not dictionaries.
if (font instanceof COSDictionary)
{
- PDFont newFont = null;
- try
- {
- newFont = PDFontFactory.createFont((COSDictionary) font);
- }
- catch (IOException exception)
- {
- LOG.error("error while creating a font", exception);
- }
- if (newFont != null)
- {
- fonts.put(fontName.getName(), newFont);
- }
+ PDFont newFont = PDFontFactory.createFont((COSDictionary) font);
+ fonts.put(fontName.getName(), newFont);
}
}
}
@@ -555,7 +544,7 @@ public class PDResources implements COSO
* @param font the font to be added
* @return the font name to be used within the content stream.
*/
- public String addFont(PDFont font)
+ public String addFont(PDFont font) throws IOException
{
// use the getter to initialize a possible empty fonts map
return addFont(font, getNextUniqueKey(getFonts(), "F"));
@@ -568,7 +557,7 @@ public class PDResources implements COSO
* @param fontKey key to used to map to the given font
* @return the font name to be used within the content stream.
*/
- public String addFont(PDFont font, String fontKey)
+ public String addFont(PDFont font, String fontKey) throws IOException
{
if (fonts == null)
{