Return-Path: X-Original-To: apmail-pdfbox-commits-archive@www.apache.org Delivered-To: apmail-pdfbox-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5F43FE7A3 for ; Sat, 2 Mar 2013 13:17:33 +0000 (UTC) Received: (qmail 15387 invoked by uid 500); 2 Mar 2013 13:17:33 -0000 Delivered-To: apmail-pdfbox-commits-archive@pdfbox.apache.org Received: (qmail 15322 invoked by uid 500); 2 Mar 2013 13:17:31 -0000 Mailing-List: contact commits-help@pdfbox.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@pdfbox.apache.org Delivered-To: mailing list commits@pdfbox.apache.org Received: (qmail 15298 invoked by uid 99); 2 Mar 2013 13:17:30 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 02 Mar 2013 13:17:30 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 02 Mar 2013 13:17:28 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 6DF4A23888CD; Sat, 2 Mar 2013 13:17:08 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1451885 - /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDXObject.java Date: Sat, 02 Mar 2013 13:17:08 -0000 To: commits@pdfbox.apache.org From: lehmi@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130302131708.6DF4A23888CD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on 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 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;