You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2014/12/29 16:00:09 UTC
svn commit: r1648356 - in
/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff:
TiffImageData.java datareaders/DataReaderStrips.java
Author: sebb
Date: Mon Dec 29 15:00:08 2014
New Revision: 1648356
URL: http://svn.apache.org/r1648356
Log:
IMAGING-117 Reduce visibility of mutable array
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageData.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderStrips.java
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageData.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageData.java?rev=1648356&r1=1648355&r2=1648356&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageData.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageData.java Mon Dec 29 15:00:08 2014
@@ -90,7 +90,7 @@ public abstract class TiffImageData {
}
public static class Strips extends TiffImageData {
- public final TiffElement.DataElement[] strips;
+ private final TiffElement.DataElement[] strips;
// public final byte strips[][];
public final int rowsPerStrip;
@@ -104,6 +104,14 @@ public abstract class TiffImageData {
return strips;
}
+ public TiffElement.DataElement getImageData(int offset) {
+ return strips[offset];
+ }
+
+ public int getImageDataLength() {
+ return strips.length;
+ }
+
@Override
public boolean stripsNotTiles() {
return true;
@@ -120,11 +128,6 @@ public abstract class TiffImageData {
width, height, compression, byteorder, rowsPerStrip, this);
}
- // public TiffElement[] getElements()
- // {
- // return strips;
- // }
-
}
// public abstract TiffElement[] getElements();
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderStrips.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderStrips.java?rev=1648356&r1=1648355&r2=1648356&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderStrips.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderStrips.java Mon Dec 29 15:00:08 2014
@@ -197,7 +197,7 @@ public final class DataReaderStrips exte
@Override
public void readImageData(final ImageBuilder imageBuilder)
throws ImageReadException, IOException {
- for (int strip = 0; strip < imageData.strips.length; strip++) {
+ for (int strip = 0; strip < imageData.getImageDataLength(); strip++) {
final long rowsPerStripLong = 0xFFFFffffL & rowsPerStrip;
final long rowsRemaining = height - (strip * rowsPerStripLong);
final long rowsInThisStrip = Math.min(rowsRemaining, rowsPerStripLong);
@@ -205,7 +205,7 @@ public final class DataReaderStrips exte
final long bytesPerStrip = rowsInThisStrip * bytesPerRow;
final long pixelsPerStrip = rowsInThisStrip * width;
- final byte[] compressed = imageData.strips[strip].getData();
+ final byte[] compressed = imageData.getImageData(strip).getData();
final byte[] decompressed = decompress(compressed, compression,
(int) bytesPerStrip, width, (int) rowsInThisStrip);
@@ -260,7 +260,7 @@ public final class DataReaderStrips exte
final long bytesPerStrip = rowsInThisStrip * bytesPerRow;
final long pixelsPerStrip = rowsInThisStrip * width;
- final byte[] compressed = imageData.strips[strip].getData();
+ final byte[] compressed = imageData.getImageData(strip).getData();
final byte[] decompressed = decompress(compressed, compression,
(int) bytesPerStrip, width, (int) rowsInThisStrip);