svn commit: r1425921 - in /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox: filter/CCITTFaxDecodeFilter.java pdmodel/graphics/xobject/PDCcitt.java pdmodel/graphics/xobject/PDPixelMap.java

[lehmi]

Author: lehmi
Date: Wed Dec 26 14:23:36 2012
New Revision: 1425921

URL: http://svn.apache.org/viewvc?rev=1425921&view=rev
Log:
PDFBOX-1475: fixed handling of decode params if those are provided as COSArray

Modified:
    
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/CCITTFaxDecodeFilter.java
    
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDCcitt.java
    
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDPixelMap.java

Modified: 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/CCITTFaxDecodeFilter.java
URL: 
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/CCITTFaxDecodeFilter.java?rev=1425921&r1=1425920&r2=1425921&view=diff
==============================================================================
--- 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/CCITTFaxDecodeFilter.java
 (original)
+++ 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/CCITTFaxDecodeFilter.java
 Wed Dec 26 14:23:36 2012
@@ -67,7 +67,7 @@ public class CCITTFaxDecodeFilter implem
         }
         else if (decodeP instanceof COSArray)
         {
-            decodeParms =  (COSDictionary)((COSArray)decodeP).get(filterIndex);
+            decodeParms =  
(COSDictionary)((COSArray)decodeP).getObject(filterIndex);
         }
         int length = options.getInt(COSName.LENGTH, -1);
         byte[] compressed = null;

Modified: 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDCcitt.java
URL: 
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDCcitt.java?rev=1425921&r1=1425920&r2=1425921&view=diff
==============================================================================
--- 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDCcitt.java
 (original)
+++ 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDCcitt.java
 Wed Dec 26 14:23:36 2012
@@ -131,7 +131,7 @@ public class PDCcitt extends PDXObjectIm
                     index++;
                 }
             }
-            decodeParms =  (COSDictionary)((COSArray)decodeP).get(index);
+            decodeParms =  (COSDictionary)((COSArray)decodeP).getObject(index);
         }
         int cols = decodeParms.getInt(COSName.COLUMNS, 1728);
         int rows = decodeParms.getInt(COSName.ROWS, 0);

Modified: 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDPixelMap.java
URL: 
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDPixelMap.java?rev=1425921&r1=1425920&r2=1425921&view=diff
==============================================================================
--- 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDPixelMap.java
 (original)
+++ 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDPixelMap.java
 Wed Dec 26 14:23:36 2012
@@ -192,7 +192,7 @@ public class PDPixelMap extends PDXObjec
             PDColorSpace colorspace = getColorSpace();
             if (colorspace == null)
             {
-                LOG.error("getColorSpace() returned NULL.  Predictor = " + 
getPredictor());
+                LOG.error("getColorSpace() returned NULL.");
                 return null;
             }
 
@@ -390,6 +390,7 @@ public class PDPixelMap extends PDXObjec
      *
      * @return The decoding parameters.
      *
+     * @deprecated Use {@link 
org.apache.pdfbox.pdmodel.common.PDStream#getDecodeParms() } instead
      */
     public COSDictionary getDecodeParams()
     {
@@ -430,6 +431,9 @@ public class PDPixelMap extends PDXObjec
      * Default value: 1.
      *
      * @return predictor algorithm code
+     * 
+     * @deprecated see {@link org.apache.pdfbox.filter.FlateFilter}
+     * 
      */
     public int getPredictor()
     {