You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ju...@apache.org on 2010/06/21 15:25:17 UTC

svn commit: r956578 - /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFont.java

Author: jukka
Date: Mon Jun 21 13:25:16 2010
New Revision: 956578

URL: http://svn.apache.org/viewvc?rev=956578&view=rev
Log:
PDFBOX-681: ClassCastException in PDTrueTypeFont.ensureFontDescriptor()

Based on the patch by Villu Ruusmann.

Modified:
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFont.java

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFont.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFont.java?rev=956578&r1=956577&r2=956578&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFont.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFont.java Mon Jun 21 13:25:16 2010
@@ -177,17 +177,16 @@ public class PDTrueTypeFont extends PDSi
 
     private void ensureFontDescriptor() throws IOException
     {
-        PDFontDescriptorDictionary fd = (PDFontDescriptorDictionary)getFontDescriptor();
-        if( fd == null )
+        if( getFontDescriptor() == null )
         {
-            fd = new PDFontDescriptorDictionary();
-            setFontDescriptor(fd);
+            PDFontDescriptorDictionary fdd = new PDFontDescriptorDictionary(); 
+            setFontDescriptor(fdd);
             InputStream ttfData = getExternalTTFData();
             if( ttfData != null )
             {
                 try
                 {
-                    loadDescriptorDictionary(this, fd, ttfData);
+                    loadDescriptorDictionary(this, fdd, ttfData);
                 }
                 finally
                 {