Return-Path: X-Original-To: apmail-commons-commits-archive@minotaur.apache.org Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B2FE490C0 for ; Thu, 26 Jan 2012 08:42:19 +0000 (UTC) Received: (qmail 38450 invoked by uid 500); 26 Jan 2012 08:42:17 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 38304 invoked by uid 500); 26 Jan 2012 08:42:10 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 38280 invoked by uid 99); 26 Jan 2012 08:42:09 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 Jan 2012 08:42:09 +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; Thu, 26 Jan 2012 08:42:07 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D2EB4238890B for ; Thu, 26 Jan 2012 08:41:47 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1236072 - /commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/datareaders/DataReader.java Date: Thu, 26 Jan 2012 08:41:47 -0000 To: commits@commons.apache.org From: damjan@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120126084147.D2EB4238890B@eris.apache.org> Author: damjan Date: Thu Jan 26 08:41:47 2012 New Revision: 1236072 URL: http://svn.apache.org/viewvc?rev=1236072&view=rev Log: Deal with TIFF files with FillOrder=2. Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/datareaders/DataReader.java Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/datareaders/DataReader.java URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/datareaders/DataReader.java?rev=1236072&r1=1236071&r2=1236072&view=diff ============================================================================== --- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/datareaders/DataReader.java (original) +++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/datareaders/DataReader.java Thu Jan 26 08:41:47 2012 @@ -109,6 +109,21 @@ public abstract class DataReader impleme protected byte[] decompress(byte compressed[], int compression, int expected_size, int tileWidth, int tileHeight) throws ImageReadException, IOException { + TiffField fillOrderField = directory.findField(TIFF_TAG_FILL_ORDER); + int fillOrder = 1; + if (fillOrderField != null) { + fillOrder = fillOrderField.getIntValue(); + } + if (fillOrder == 1) { + // good + } else if (fillOrder == 2) { + for (int i = 0; i < compressed.length; i++) { + compressed[i] = (byte) (Integer.reverse(0xff & compressed[i]) >>> 24); + } + } else { + throw new ImageReadException("TIFF FillOrder=" + fillOrder + " is invalid"); + } + switch (compression) { case TIFF_COMPRESSION_UNCOMPRESSED : // None;