svn commit: r1808464 - /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/Filter.java

[tilman]

Author: tilman
Date: Fri Sep 15 16:37:51 2017
New Revision: 1808464

URL: http://svn.apache.org/viewvc?rev=1808464&view=rev
Log:
PDFBOX-3932: expect dictionary when filter is a name, and array only if filter 
array

Modified:
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/Filter.java

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/Filter.java
URL: 
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/Filter.java?rev=1808464&r1=1808463&r2=1808464&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/Filter.java 
(original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/Filter.java Fri 
Sep 15 16:37:51 2017
@@ -82,12 +82,16 @@ public abstract class Filter
     // normalise the DecodeParams entry so that it is always a dictionary
     protected COSDictionary getDecodeParams(COSDictionary dictionary, int 
index)
     {
+        COSBase filter = dictionary.getDictionaryObject(COSName.FILTER, 
COSName.F);
         COSBase obj = dictionary.getDictionaryObject(COSName.DECODE_PARMS, 
COSName.DP);
-        if (obj instanceof COSDictionary)
+        if (filter instanceof COSName && obj instanceof COSDictionary)
         {
+            // PDFBOX-3932: The PDF specification requires "If there is only 
one filter and that 
+            // filter has parameters, DecodeParms shall be set to the 
filter’s parameter dictionary" 
+            // but tests show that Adobe means "one filter name object".
             return (COSDictionary)obj;
         }
-        else if (obj instanceof COSArray)
+        else if (filter instanceof COSArray && obj instanceof COSArray)
         {
             COSArray array = (COSArray)obj;
             if (index < array.size())
@@ -95,7 +99,7 @@ public abstract class Filter
                 return (COSDictionary)array.getObject(index);
             }
         }
-        else if (obj != null)
+        else if (obj != null && !(filter instanceof COSArray || obj instanceof 
COSArray))
         {
             LOG.error("Expected DecodeParams to be an Array or Dictionary but 
found " +
                       obj.getClass().getName());