You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2020/11/21 18:13:20 UTC
[commons-imaging] branch master updated: Use for-each.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-imaging.git
The following commit(s) were added to refs/heads/master by this push:
new fdac35a Use for-each.
fdac35a is described below
commit fdac35a58d8197643f5e1d3a06f80621ef8c8f9e
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Nov 21 13:13:15 2020 -0500
Use for-each.
---
.../imaging/formats/jpeg/decoder/JpegDecoder.java | 10 +++++----
.../imaging/formats/tiff/TiffRasterStatistics.java | 3 +--
.../formats/tiff/datareaders/DataReaderStrips.java | 4 ++--
.../commons/imaging/examples/MetadataExample.java | 3 +--
.../imaging/examples/tiff/SurveyTiffFolder.java | 4 ++--
.../imaging/formats/jpeg/exif/ExifRewriteTest.java | 26 +++++++++-------------
.../commons/imaging/formats/pam/PamReadTest.java | 3 +--
.../commons/imaging/formats/pcx/PcxReadTest.java | 3 +--
.../imaging/formats/png/ConvertPngToGifTest.java | 3 +--
.../commons/imaging/formats/png/PngReadTest.java | 3 +--
.../imaging/formats/tiff/TiffReadAlphaTest.java | 8 +++----
11 files changed, 30 insertions(+), 40 deletions(-)
diff --git a/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/JpegDecoder.java b/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/JpegDecoder.java
index 6449020..92a9e8b 100644
--- a/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/JpegDecoder.java
+++ b/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/JpegDecoder.java
@@ -38,7 +38,9 @@ import org.apache.commons.imaging.common.bytesource.ByteSource;
import org.apache.commons.imaging.formats.jpeg.JpegConstants;
import org.apache.commons.imaging.formats.jpeg.JpegUtils;
import org.apache.commons.imaging.formats.jpeg.segments.DhtSegment;
+import org.apache.commons.imaging.formats.jpeg.segments.DhtSegment.HuffmanTable;
import org.apache.commons.imaging.formats.jpeg.segments.DqtSegment;
+import org.apache.commons.imaging.formats.jpeg.segments.DqtSegment.QuantizationTable;
import org.apache.commons.imaging.formats.jpeg.segments.SofnSegment;
import org.apache.commons.imaging.formats.jpeg.segments.SosSegment;
@@ -239,8 +241,8 @@ public class JpegDecoder extends BinaryFileParser implements JpegUtils.Visitor {
sofnSegment = new SofnSegment(marker, segmentData);
} else if (marker == JpegConstants.DQT_MARKER) {
final DqtSegment dqtSegment = new DqtSegment(marker, segmentData);
- for (int i = 0; i < dqtSegment.quantizationTables.size(); i++) {
- final DqtSegment.QuantizationTable table = dqtSegment.quantizationTables.get(i);
+ for (final QuantizationTable element : dqtSegment.quantizationTables) {
+ final DqtSegment.QuantizationTable table = element;
if (0 > table.destinationIdentifier
|| table.destinationIdentifier >= quantizationTables.length) {
throw new ImageReadException(
@@ -259,8 +261,8 @@ public class JpegDecoder extends BinaryFileParser implements JpegUtils.Visitor {
}
} else if (marker == JpegConstants.DHT_MARKER) {
final DhtSegment dhtSegment = new DhtSegment(marker, segmentData);
- for (int i = 0; i < dhtSegment.huffmanTables.size(); i++) {
- final DhtSegment.HuffmanTable table = dhtSegment.huffmanTables.get(i);
+ for (final HuffmanTable element : dhtSegment.huffmanTables) {
+ final DhtSegment.HuffmanTable table = element;
DhtSegment.HuffmanTable[] tables;
if (table.tableClass == 0) {
tables = huffmanDCTables;
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffRasterStatistics.java b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffRasterStatistics.java
index c903cd9..2c117a5 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffRasterStatistics.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffRasterStatistics.java
@@ -44,8 +44,7 @@ public class TiffRasterStatistics {
int nS = 0;
int nN = 0;
final float[] data = raster.getData();
- for (int i = 0; i < data.length; i++) {
- final float test = data[i];
+ for (final float test : data) {
if (Float.isNaN(test)) {
nN++;
continue;
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderStrips.java b/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderStrips.java
index a25daa8..c337559 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderStrips.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderStrips.java
@@ -326,8 +326,8 @@ public final class DataReaderStrips extends ImageDataReader {
final byte[] decompressed = decompress(compressed, compression,
(int) bytesPerStrip, width, (int) rowsInThisStrip);
int index = iPlane;
- for (int i = 0; i < decompressed.length; i++) {
- b[index] = decompressed[i];
+ for (final byte element : decompressed) {
+ b[index] = element;
index += 3;
}
}
diff --git a/src/test/java/org/apache/commons/imaging/examples/MetadataExample.java b/src/test/java/org/apache/commons/imaging/examples/MetadataExample.java
index b976e30..4bffadb 100644
--- a/src/test/java/org/apache/commons/imaging/examples/MetadataExample.java
+++ b/src/test/java/org/apache/commons/imaging/examples/MetadataExample.java
@@ -140,8 +140,7 @@ public class MetadataExample {
System.out.println();
final List<ImageMetadataItem> items = jpegMetadata.getItems();
- for (int i = 0; i < items.size(); i++) {
- final ImageMetadataItem item = items.get(i);
+ for (final ImageMetadataItem item : items) {
System.out.println(" " + "item: " + item);
}
diff --git a/src/test/java/org/apache/commons/imaging/examples/tiff/SurveyTiffFolder.java b/src/test/java/org/apache/commons/imaging/examples/tiff/SurveyTiffFolder.java
index fea5b8e..e2a80d5 100644
--- a/src/test/java/org/apache/commons/imaging/examples/tiff/SurveyTiffFolder.java
+++ b/src/test/java/org/apache/commons/imaging/examples/tiff/SurveyTiffFolder.java
@@ -181,8 +181,8 @@ public class SurveyTiffFolder {
private static void surveyFiles(final File topDir, final List<String[]> pathList, final int[] maxLen, final boolean csv, final PrintStream ps) {
final SurveyTiffFile surveyor = new SurveyTiffFile();
int n = maxLen.length - 1;
- for (int i = 0; i < maxLen.length; i++) {
- n += maxLen[i];
+ for (final int element : maxLen) {
+ n += element;
}
if (n < 10) {
n = 10;
diff --git a/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java b/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java
index 5581d25..63737c9 100644
--- a/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java
@@ -61,9 +61,8 @@ public class ExifRewriteTest extends ExifBaseTest {
@Test
public void testRemove() throws Exception {
final List<File> images = getImagesWithExifData();
- for (int i = 0; i < images.size(); i++) {
+ for (final File imageFile : images) {
- final File imageFile = images.get(i);
Debug.debug("imageFile", imageFile);
final boolean ignoreImageData = isPhilHarveyTestImage(imageFile);
@@ -99,9 +98,8 @@ public class ExifRewriteTest extends ExifBaseTest {
@Test
public void testInsert() throws Exception {
final List<File> images = getImagesWithExifData();
- for (int i = 0; i < images.size(); i++) {
+ for (final File imageFile : images) {
- final File imageFile = images.get(i);
Debug.debug("imageFile", imageFile);
final boolean ignoreImageData = isPhilHarveyTestImage(imageFile);
@@ -175,9 +173,7 @@ public class ExifRewriteTest extends ExifBaseTest {
private void rewrite(final Rewriter rewriter, final String name) throws IOException,
ImageReadException {
final List<File> images = getImagesWithExifData();
- for (int i = 0; i < images.size(); i++) {
-
- final File imageFile = images.get(i);
+ for (final File imageFile : images) {
try {
@@ -264,8 +260,8 @@ public class ExifRewriteTest extends ExifBaseTest {
private Map<Integer,TiffImageMetadata.Directory> makeDirectoryMap(final List<? extends ImageMetadataItem> directories) {
final Map<Integer,TiffImageMetadata.Directory> directoryMap = new HashMap<>();
- for (int i = 0; i < directories.size(); i++) {
- final TiffImageMetadata.Directory directory = (TiffImageMetadata.Directory) directories.get(i);
+ for (final ImageMetadataItem element : directories) {
+ final TiffImageMetadata.Directory directory = (TiffImageMetadata.Directory) element;
directoryMap.put(directory.type, directory);
}
return directoryMap;
@@ -273,8 +269,8 @@ public class ExifRewriteTest extends ExifBaseTest {
private Map<Integer,TiffField> makeFieldMap(final List<? extends ImageMetadataItem> items) {
final Map<Integer,TiffField> fieldMap = new HashMap<>();
- for (int i = 0; i < items.size(); i++) {
- final TiffImageMetadata.TiffMetadataItem item = (TiffImageMetadata.TiffMetadataItem) items.get(i);
+ for (final ImageMetadataItem item2 : items) {
+ final TiffImageMetadata.TiffMetadataItem item = (TiffImageMetadata.TiffMetadataItem) item2;
final TiffField field = item.getTiffField();
if (!fieldMap.containsKey(field.getTag())) {
fieldMap.put(field.getTag(), field);
@@ -303,8 +299,8 @@ public class ExifRewriteTest extends ExifBaseTest {
Collections.sort(newDirectoryTypes);
assertEquals(oldDirectoryTypes, newDirectoryTypes);
- for (int i = 0; i < oldDirectoryTypes.size(); i++) {
- final Integer dirType = oldDirectoryTypes.get(i);
+ for (final Integer dirType : oldDirectoryTypes) {
+
// Debug.debug("dirType", dirType);
@@ -338,9 +334,7 @@ public class ExifRewriteTest extends ExifBaseTest {
Collections.sort(newFieldTags);
assertEquals(oldFieldTags, newFieldTags);
- for (int j = 0; j < oldFieldTags.size(); j++) {
- final Integer fieldTag = oldFieldTags.get(j);
-
+ for (final Integer fieldTag : oldFieldTags) {
final TiffField oldField = oldFieldMap.get(fieldTag);
final TiffField newField = newFieldMap.get(fieldTag);
diff --git a/src/test/java/org/apache/commons/imaging/formats/pam/PamReadTest.java b/src/test/java/org/apache/commons/imaging/formats/pam/PamReadTest.java
index 94b9cbd..a68bcb0 100644
--- a/src/test/java/org/apache/commons/imaging/formats/pam/PamReadTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/pam/PamReadTest.java
@@ -39,9 +39,8 @@ public class PamReadTest extends PamBaseTest {
Debug.debug("start");
final List<File> images = getPamImages();
- for (int i = 0; i < images.size(); i++) {
+ for (final File imageFile : images) {
- final File imageFile = images.get(i);
Debug.debug("imageFile", imageFile);
final ImageMetadata metadata = Imaging.getMetadata(imageFile);
diff --git a/src/test/java/org/apache/commons/imaging/formats/pcx/PcxReadTest.java b/src/test/java/org/apache/commons/imaging/formats/pcx/PcxReadTest.java
index bad6e39..a100460 100644
--- a/src/test/java/org/apache/commons/imaging/formats/pcx/PcxReadTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/pcx/PcxReadTest.java
@@ -39,9 +39,8 @@ public class PcxReadTest extends PcxBaseTest {
Debug.debug("start");
final List<File> images = getPcxImages();
- for (int i = 0; i < images.size(); i++) {
+ for (final File imageFile : images) {
- final File imageFile = images.get(i);
Debug.debug("imageFile", imageFile);
final ImageMetadata metadata = Imaging.getMetadata(imageFile);
diff --git a/src/test/java/org/apache/commons/imaging/formats/png/ConvertPngToGifTest.java b/src/test/java/org/apache/commons/imaging/formats/png/ConvertPngToGifTest.java
index aee3468..cd754b3 100644
--- a/src/test/java/org/apache/commons/imaging/formats/png/ConvertPngToGifTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/png/ConvertPngToGifTest.java
@@ -36,9 +36,8 @@ public class ConvertPngToGifTest extends PngBaseTest {
public void test() throws Exception {
final List<File> images = getPngImages();
- for (int i = 0; i < images.size(); i++) {
+ for (final File imageFile : images) {
- final File imageFile = images.get(i);
if (isInvalidPNGTestFile(imageFile))
{
continue;
diff --git a/src/test/java/org/apache/commons/imaging/formats/png/PngReadTest.java b/src/test/java/org/apache/commons/imaging/formats/png/PngReadTest.java
index 9462f70..91e1cc5 100644
--- a/src/test/java/org/apache/commons/imaging/formats/png/PngReadTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/png/PngReadTest.java
@@ -38,9 +38,8 @@ public class PngReadTest extends PngBaseTest {
Debug.debug("start");
final List<File> images = getPngImages();
- for (int i = 0; i < images.size(); i++) {
+ for (final File imageFile : images) {
- final File imageFile = images.get(i);
Debug.debug("imageFile", imageFile);
if (isInvalidPNGTestFile(imageFile)) {
assertThrows(
diff --git a/src/test/java/org/apache/commons/imaging/formats/tiff/TiffReadAlphaTest.java b/src/test/java/org/apache/commons/imaging/formats/tiff/TiffReadAlphaTest.java
index 7891f33..aa0553d 100644
--- a/src/test/java/org/apache/commons/imaging/formats/tiff/TiffReadAlphaTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/tiff/TiffReadAlphaTest.java
@@ -76,10 +76,10 @@ public class TiffReadAlphaTest {
g2d.fillRect(0, 50, 101, 51);
g2d.drawImage(overlay, 0, 0, null);
- for (int i = 0; i < testSite.length; i++) {
- final int x = testSite[i][0];
- final int y = testSite[i][1];
- final int p = testSite[i][2];
+ for (final int[] element : testSite) {
+ final int x = element[0];
+ final int y = element[1];
+ final int p = element[2];
final int t = composite.getRGB(x, y);
assertEquals(t, p, "Error for " + name + " at position " + x + ", " + y);
}