svn commit: r1451885 - /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDXObject.java

[le...@apache.org]

Author: lehmi
Date: Sat Mar  2 13:17:08 2013
New Revision: 1451885

URL: http://svn.apache.org/r1451885
Log:
PDFBOX-1518: fixed an issue with choosing the correct kind of a XObject introduced in revision 1446888

Modified:
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDXObject.java

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDXObject.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDXObject.java?rev=1451885&r1=1451884&r2=1451885&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDXObject.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDXObject.java Sat Mar  2 13:17:08 2013
@@ -44,7 +44,7 @@ public abstract class PDXObject implemen
     /**
      * Log instance.
      */
-    private static final Log log = LogFactory.getLog(PDXObject.class);
+    private static final Log LOG = LogFactory.getLog(PDXObject.class);
 
     private PDStream xobject;
 
@@ -134,16 +134,16 @@ public abstract class PDXObject implemen
                 // See if filters are DCT or JPX otherwise treat as Bitmap-like
                 // There might be a problem with several filters, but that's ToDo until
                 // I find an example
-                List filters = image.getFilters();
-                if( filters != null && filters.contains( COSName.DCT_DECODE.getName() ) )
+                List<COSName> filters = image.getFilters();
+                if( filters != null && filters.contains( COSName.DCT_DECODE ) )
                 {
                     return new PDJpeg(image);
                 }
-                else if ( filters != null && filters.contains( COSName.CCITTFAX_DECODE.getName() ) )
+                else if ( filters != null && filters.contains( COSName.CCITTFAX_DECODE ) )
                 {
                     return new PDCcitt(image);
                 }
-                else if( filters != null && filters.contains(COSName.JPX_DECODE.getName()))
+                else if( filters != null && filters.contains(COSName.JPX_DECODE))
                 {
                     //throw new IOException( "JPXDecode has not been implemented for images" );
                     //JPX Decode is not really supported right now, but if we are just doing
@@ -163,7 +163,7 @@ public abstract class PDXObject implemen
             }
             else
             {
-                log.warn( "Skipping unknown XObject subtype '" + subtype + "'" );
+                LOG.warn( "Skipping unknown XObject subtype '" + subtype + "'" );
             }
         }
         return retval;