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 2014/12/05 07:58:23 UTC
svn commit: r1643163 -
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFontDescriptor.java
Author: tilman
Date: Fri Dec 5 06:58:22 2014
New Revision: 1643163
URL: http://svn.apache.org/viewvc?rev=1643163&view=rev
Log:
PDFBOX-2543: avoid ClassCastException if wrong object as /FontFile*
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFontDescriptor.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFontDescriptor.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFontDescriptor.java?rev=1643163&r1=1643162&r2=1643163&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFontDescriptor.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFontDescriptor.java Fri Dec 5 06:58:22 2014
@@ -17,6 +17,7 @@
package org.apache.pdfbox.pdmodel.font;
import org.apache.pdfbox.cos.COSArray;
+import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSDictionary;
import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.cos.COSStream;
@@ -271,6 +272,7 @@ public final class PDFontDescriptor impl
*
* @return The cos object that matches this Java object.
*/
+ @Override
public COSDictionary getCOSObject()
{
return dic;
@@ -737,10 +739,10 @@ public final class PDFontDescriptor impl
public PDStream getFontFile()
{
PDStream retval = null;
- COSStream stream = (COSStream)dic.getDictionaryObject( COSName.FONT_FILE );
- if( stream != null )
+ COSBase obj = dic.getDictionaryObject(COSName.FONT_FILE);
+ if (obj instanceof COSStream)
{
- retval = new PDStream( stream );
+ retval = new PDStream((COSStream) obj);
}
return retval;
}
@@ -763,10 +765,10 @@ public final class PDFontDescriptor impl
public PDStream getFontFile2()
{
PDStream retval = null;
- COSStream stream = (COSStream)dic.getDictionaryObject( COSName.FONT_FILE2 );
- if( stream != null )
+ COSBase obj = dic.getDictionaryObject(COSName.FONT_FILE2);
+ if (obj instanceof COSStream)
{
- retval = new PDStream( stream );
+ retval = new PDStream((COSStream) obj);
}
return retval;
}
@@ -789,10 +791,10 @@ public final class PDFontDescriptor impl
public PDStream getFontFile3()
{
PDStream retval = null;
- COSStream stream = (COSStream)dic.getDictionaryObject( COSName.FONT_FILE3 );
- if( stream != null )
+ COSBase obj = dic.getDictionaryObject(COSName.FONT_FILE3);
+ if (obj instanceof COSStream)
{
- retval = new PDStream( stream );
+ retval = new PDStream((COSStream) obj);
}
return retval;
}