From commits-return-25669-apmail-commons-commits-archive=commons.apache.org@commons.apache.org Sat Mar 3 15:21:17 2012 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 0B1709900 for ; Sat, 3 Mar 2012 15:21:17 +0000 (UTC) Received: (qmail 5910 invoked by uid 500); 3 Mar 2012 15:21:16 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 5842 invoked by uid 500); 3 Mar 2012 15:21:16 -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 5835 invoked by uid 99); 3 Mar 2012 15:21:16 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 03 Mar 2012 15:21:16 +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, 03 Mar 2012 15:21:15 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id A8A3023888D2 for ; Sat, 3 Mar 2012 15:20:54 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1296636 - /commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffReader.java Date: Sat, 03 Mar 2012 15:20:54 -0000 To: commits@commons.apache.org From: damjan@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120303152054.A8A3023888D2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: damjan Date: Sat Mar 3 15:20:54 2012 New Revision: 1296636 URL: http://svn.apache.org/viewvc?rev=1296636&view=rev Log: Allow RowsPerStrip to be optional, and treat it as infinity when it is. Submitted by: Piyush Kapoor Jira issue key: SANSELAN-65 Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffReader.java Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffReader.java URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffReader.java?rev=1296636&r1=1296635&r2=1296636&view=diff ============================================================================== --- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffReader.java (original) +++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffReader.java Sat Mar 3 15:20:54 2012 @@ -478,9 +478,18 @@ public class TiffReader extends BinaryFi { TiffField rowsPerStripField = directory .findField(TiffTagConstants.TIFF_TAG_ROWS_PER_STRIP); - if (null == rowsPerStripField) - throw new ImageReadException("Can't find rows per strip field."); - int rowsPerStrip = rowsPerStripField.getIntValue(); + int rowsPerStrip ; + + if (null != rowsPerStripField) { + rowsPerStrip = rowsPerStripField.getIntValue(); + } else { + TiffField imageHeight = directory.findField(TiffTagConstants.TIFF_TAG_IMAGE_LENGTH); + /** + * if rows per strip not present then rowsPerStrip + * is equal to imageLength or an infinity value; + */ + rowsPerStrip = imageHeight.getIntValue(); + } return new TiffImageData.Strips(data, rowsPerStrip); } else