Author: jahewson
Date: Tue Aug 26 20:04:08 2014
New Revision: 1620719
URL: http://svn.apache.org/r1620719
Log:
PDFBOX-2262: Use MissingWidth only when widths are present
Modified:
pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java
pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFontDescriptorDictionary.java
Modified:
pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java
URL:
http://svn.apache.org/viewvc/pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java?rev=1620719&r1=1620718&r2=1620719&view=diff
==============================================================================
---
pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java
(original)
+++
pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java
Tue Aug 26 20:04:08 2014
@@ -179,7 +179,8 @@ public abstract class PDFont implements
else
{
PDFontDescriptor fd = getFontDescriptor();
- if (fd instanceof PDFontDescriptorDictionary)
+ if (fd instanceof PDFontDescriptorDictionary &&
+ ((PDFontDescriptorDictionary) fd).hasWidths())
{
return fd.getMissingWidth();
}
Modified:
pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFontDescriptorDictionary.java
URL:
http://svn.apache.org/viewvc/pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFontDescriptorDictionary.java?rev=1620719&r1=1620718&r2=1620719&view=diff
==============================================================================
---
pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFontDescriptorDictionary.java
(original)
+++
pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFontDescriptorDictionary.java
Tue Aug 26 20:04:08 2014
@@ -475,6 +475,14 @@ public class PDFontDescriptorDictionary
}
/**
+ * Returns true if widths are present in the font descriptor.
+ */
+ public boolean hasWidths()
+ {
+ return dic.containsKey(COSName.WIDTHS) ||
dic.containsKey(COSName.MISSING_WIDTH);
+ }
+
+ /**
* This will get the missing width for the font.
*
* @return The missing width value.
