| commit | 5344a3149355e843238cdcbcd537d99e0c0564fd | [log] [tgz] |
|---|---|---|
| author | Damjan Jovanovic <damjan@apache.org> | Fri Apr 13 16:39:37 2012 +0000 |
| committer | Damjan Jovanovic <damjan@apache.org> | Fri Apr 13 16:39:37 2012 +0000 |
| tree | ee2d2a0fa755bf85e8baae20315d11283fdf5cef | |
| parent | 6b6fcdd6cd64d8700c14395b89425acd735159d0 [diff] |
Correct the expected size of the decompressed TIFF image data. Jira issue key: SANSELAN-72 git-svn-id: https://svn.apache.org/repos/asf/commons/proper/sanselan/trunk@1325834 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/commons/sanselan/formats/tiff/datareaders/DataReaderStrips.java b/src/main/java/org/apache/commons/sanselan/formats/tiff/datareaders/DataReaderStrips.java index 51d1a1b..3c42537 100644 --- a/src/main/java/org/apache/commons/sanselan/formats/tiff/datareaders/DataReaderStrips.java +++ b/src/main/java/org/apache/commons/sanselan/formats/tiff/datareaders/DataReaderStrips.java
@@ -95,8 +95,9 @@ long rowsPerStripLong = 0xFFFFffffL & rowsPerStrip; long rowsRemaining = height - (strip * rowsPerStripLong); long rowsInThisStrip = Math.min(rowsRemaining, rowsPerStripLong); + long bytesPerRow = (bitsPerPixel * width + 7) / 8; + long bytesPerStrip = rowsInThisStrip * bytesPerRow; long pixelsPerStrip = rowsInThisStrip * width; - long bytesPerStrip = ((pixelsPerStrip * bitsPerPixel) + 7) / 8; byte compressed[] = imageData.strips[strip].data; @@ -108,4 +109,4 @@ } } -} \ No newline at end of file +}