Author: damjan
Date: Wed Sep 7 17:24:01 2016
New Revision: 1759648
URL: http://svn.apache.org/viewvc?rev=1759648&view=rev
Log:
Simplify some array operations.
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReader.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceTest.java
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReader.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReader.java?rev=1759648&r1=1759647&r2=1759648&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReader.java
(original)
+++
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReader.java
Wed Sep 7 17:24:01 2016
@@ -16,12 +16,24 @@
*/
package org.apache.commons.imaging.formats.tiff.datareaders;
+import static
org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_COMPRESSION_CCITT_1D;
+import static
org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_COMPRESSION_CCITT_GROUP_3;
+import static
org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_COMPRESSION_CCITT_GROUP_4;
+import static
org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_COMPRESSION_LZW;
+import static
org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_COMPRESSION_PACKBITS;
+import static
org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_COMPRESSION_UNCOMPRESSED;
+import static
org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_FLAG_T4_OPTIONS_2D;
+import static
org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_FLAG_T4_OPTIONS_FILL;
+import static
org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_FLAG_T4_OPTIONS_UNCOMPRESSED_MODE;
+import static
org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_FLAG_T6_OPTIONS_UNCOMPRESSED_MODE;
+
import java.awt.Rectangle;
import java.awt.image.BufferedImage;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.nio.ByteOrder;
+import java.util.Arrays;
import org.apache.commons.imaging.ImageReadException;
import org.apache.commons.imaging.common.ImageBuilder;
@@ -33,8 +45,6 @@ import org.apache.commons.imaging.format
import org.apache.commons.imaging.formats.tiff.constants.TiffTagConstants;
import
org.apache.commons.imaging.formats.tiff.photometricinterpreters.PhotometricInterpreter;
-import static
org.apache.commons.imaging.formats.tiff.constants.TiffConstants.*;
-
public abstract class DataReader {
protected final TiffDirectory directory;
protected final PhotometricInterpreter photometricInterpreter;
@@ -112,9 +122,7 @@ public abstract class DataReader {
}
protected void resetPredictor() {
- for (int i = 0; i < last.length; i++) {
- last[i] = 0;
- }
+ Arrays.fill(last, 0);
}
protected int[] applyPredictor(final int[] samples) {
Modified:
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceTest.java?rev=1759648&r1=1759647&r2=1759648&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceTest.java
(original)
+++
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceTest.java
Wed Sep 7 17:24:01 2016
@@ -58,9 +58,6 @@ public abstract class ByteSourceTest ext
}
final byte zeroes[] = new byte[256];
- for (int i = 0; i < zeroes.length; i++) {
- zeroes[i] = 0;
- }
final ByteArrayOutputStream baos = new ByteArrayOutputStream();
for (int i = 0; i < 256 * 256; i++) {