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/05/24 15:58:38 UTC

svn commit: r1597300 - /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDocument.java

Author: tilman
Date: Sat May 24 13:58:38 2014
New Revision: 1597300

URL: http://svn.apache.org/r1597300
Log:
PDFBOX-1756: add leniency to getObjectsByType() too

Modified:
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDocument.java

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDocument.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDocument.java?rev=1597300&r1=1597299&r2=1597300&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDocument.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDocument.java Sat May 24 13:58:38 2014
@@ -301,10 +301,18 @@ public class COSDocument extends COSBase
                 try
                 {
                     COSDictionary dic = (COSDictionary)realObject;
-                    COSName objectType = (COSName)dic.getItem( COSName.TYPE );
-                    if( objectType != null && objectType.equals( type ) )
+                    COSBase typeItem = dic.getItem(COSName.TYPE);
+                    if (typeItem != null && typeItem instanceof COSName)
                     {
-                        retval.add( object );
+                        COSName objectType = (COSName) typeItem;
+                        if (objectType.equals(type))
+                        {
+                            retval.add( object );
+                        }
+                    }
+                    else if (typeItem != null)
+                    {
+                        LOG.debug("Expected a /Name object after /Type, got '" + typeItem + "' instead");
                     }
                 }
                 catch (ClassCastException e)