This is an automated email from the ASF dual-hosted git repository.
kinow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-imaging.git
commit 761d284855e3087cdd4ef95c2d12dd24bd40feae
Author: Bruno P. Kinoshita <ki...@apache.org>
AuthorDate: Thu Dec 2 22:17:43 2021 +1300
[IMAGING-159] Update the rest of the code after rebasing onto master
---
.../commons/imaging/formats/tiff/TiffImageParser.java | 3 +--
.../apache/commons/imaging/formats/gif/GifReadTest.java | 2 +-
.../apache/commons/imaging/formats/png/PngReadTest.java | 2 +-
.../tiff/TiffFloatingPointMultivariableTest.java | 12 +-----------
.../imaging/formats/tiff/TiffRasterDataTest.java | 1 -
.../imaging/formats/tiff/TiffShortIntRoundTripTest.java | 17 ++++-------------
.../commons/imaging/formats/tiff/TiffSubImageTest.java | 2 +-
7 files changed, 9 insertions(+), 30 deletions(-)
diff --git
a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java
b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java
index 36eb873..431c14c 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java
@@ -34,7 +34,6 @@ import java.io.PrintWriter;
import java.nio.ByteOrder;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
import org.apache.commons.imaging.FormatCompliance;
@@ -133,7 +132,7 @@ public class TiffImageParser extends
ImageParser<TiffImagingParameters> implemen
public ImageMetadata getMetadata(final ByteSource byteSource,
TiffImagingParameters params)
throws ImageReadException, IOException {
if (params == null) {
- params = new TiffImagingParameters();
+ params = this.getDefaultParameters();
}
final FormatCompliance formatCompliance =
FormatCompliance.getDefault();
final TiffReader tiffReader = new TiffReader(params.isStrict());
diff --git
a/src/test/java/org/apache/commons/imaging/formats/gif/GifReadTest.java
b/src/test/java/org/apache/commons/imaging/formats/gif/GifReadTest.java
index fff48c9..790d58f 100644
--- a/src/test/java/org/apache/commons/imaging/formats/gif/GifReadTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/gif/GifReadTest.java
@@ -194,6 +194,6 @@ public class GifReadTest extends GifBaseTest {
final String input =
"/images/gif/IMAGING-318/clusterfuzz-testcase-minimized-ImagingGifFuzzer-5005192379629568";
final String file = GifReadTest.class.getResource(input).getFile();
final GifImageParser parser = new GifImageParser();
- assertThrows(ImageReadException.class, () ->
parser.getBufferedImage(new ByteSourceFile(new File(file)),
Collections.emptyMap()));
+ assertThrows(ImageReadException.class, () ->
parser.getBufferedImage(new ByteSourceFile(new File(file)), new
GifImagingParameters()));
}
}
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 7655477..2630a97 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
@@ -107,6 +107,6 @@ public class PngReadTest extends PngBaseTest {
final String input =
"/images/png/IMAGING-317/clusterfuzz-testcase-minimized-ImagingPngFuzzer-6242400830357504";
final String file = PngReadTest.class.getResource(input).getFile();
final PngImageParser parser = new PngImageParser();
- assertThrows(ImageReadException.class, () ->
parser.getBufferedImage(new ByteSourceFile(new File(file)),
Collections.emptyMap()));
+ assertThrows(ImageReadException.class, () ->
parser.getBufferedImage(new ByteSourceFile(new File(file)), new
PngImagingParameters()));
}
}
diff --git
a/src/test/java/org/apache/commons/imaging/formats/tiff/TiffFloatingPointMultivariableTest.java
b/src/test/java/org/apache/commons/imaging/formats/tiff/TiffFloatingPointMultivariableTest.java
index eed4b9a..8231092 100644
---
a/src/test/java/org/apache/commons/imaging/formats/tiff/TiffFloatingPointMultivariableTest.java
+++
b/src/test/java/org/apache/commons/imaging/formats/tiff/TiffFloatingPointMultivariableTest.java
@@ -18,9 +18,7 @@ package org.apache.commons.imaging.formats.tiff;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.fail;
-import java.awt.image.BufferedImage;
import java.io.BufferedOutputStream;
import java.io.File;
import java.io.FileOutputStream;
@@ -28,18 +26,13 @@ import java.io.IOException;
import java.nio.ByteOrder;
import java.nio.file.Path;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
import org.apache.commons.imaging.FormatCompliance;
-import org.apache.commons.imaging.ImageReadException;
import org.apache.commons.imaging.ImageWriteException;
-import org.apache.commons.imaging.common.ImageBuilder;
import org.apache.commons.imaging.common.bytesource.ByteSourceFile;
-import org.apache.commons.imaging.formats.tiff.constants.TiffConstants;
import
org.apache.commons.imaging.formats.tiff.constants.TiffPlanarConfiguration;
import org.apache.commons.imaging.formats.tiff.constants.TiffTagConstants;
-import
org.apache.commons.imaging.formats.tiff.photometricinterpreters.floatingpoint.PhotometricInterpreterFloat;
import org.apache.commons.imaging.formats.tiff.write.TiffImageWriterLossy;
import org.apache.commons.imaging.formats.tiff.write.TiffOutputDirectory;
import org.apache.commons.imaging.formats.tiff.write.TiffOutputSet;
@@ -112,9 +105,7 @@ public class TiffFloatingPointMultivariableTest extends
TiffBaseTest {
true, // indicates that application should read image data, if
present
FormatCompliance.getDefault());
final TiffDirectory directory = contents.directories.get(0);
- final HashMap<String, Object> params = new HashMap<>();
- final ByteOrder byteOrder = tiffReader.getByteOrder();
- final TiffRasterData raster = directory.getRasterData(params);
+ final TiffRasterData raster = directory.getRasterData(new
TiffImagingParameters());
assertNotNull(raster, "Failed to get raster from " + name);
assertEquals(2, raster.getSamplesPerPixel(), "Invalid samples per
pixel in " + name);
for(int iPlane = 0; iPlane<2; iPlane++){
@@ -260,7 +251,6 @@ public class TiffFloatingPointMultivariableTest extends
TiffBaseTest {
for (int i = 0; i < height; i++) {
final int blockRow = i / nRowsInBlock;
final int rowInBlock = i - blockRow * nRowsInBlock;
- final int blockRowOffset = rowInBlock * nColsInBlock;
for (int j = 0; j < width; j++) {
final int blockCol = j / nColsInBlock;
final int colInBlock = j - blockCol * nColsInBlock;
diff --git
a/src/test/java/org/apache/commons/imaging/formats/tiff/TiffRasterDataTest.java
b/src/test/java/org/apache/commons/imaging/formats/tiff/TiffRasterDataTest.java
index 0d05b14..b9b4462 100644
---
a/src/test/java/org/apache/commons/imaging/formats/tiff/TiffRasterDataTest.java
+++
b/src/test/java/org/apache/commons/imaging/formats/tiff/TiffRasterDataTest.java
@@ -20,7 +20,6 @@ import static
org.junit.jupiter.api.Assertions.assertArrayEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
import org.junit.jupiter.api.Test;
diff --git
a/src/test/java/org/apache/commons/imaging/formats/tiff/TiffShortIntRoundTripTest.java
b/src/test/java/org/apache/commons/imaging/formats/tiff/TiffShortIntRoundTripTest.java
index 3c7123d..267f0ee 100644
---
a/src/test/java/org/apache/commons/imaging/formats/tiff/TiffShortIntRoundTripTest.java
+++
b/src/test/java/org/apache/commons/imaging/formats/tiff/TiffShortIntRoundTripTest.java
@@ -25,14 +25,11 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.nio.ByteOrder;
import java.nio.file.Path;
-import java.util.HashMap;
-import java.util.Map;
import org.apache.commons.imaging.FormatCompliance;
import org.apache.commons.imaging.ImageReadException;
import org.apache.commons.imaging.ImageWriteException;
import org.apache.commons.imaging.common.bytesource.ByteSourceFile;
-import org.apache.commons.imaging.formats.tiff.constants.TiffConstants;
import org.apache.commons.imaging.formats.tiff.constants.TiffTagConstants;
import org.apache.commons.imaging.formats.tiff.write.TiffImageWriterLossy;
import org.apache.commons.imaging.formats.tiff.write.TiffOutputDirectory;
@@ -92,11 +89,8 @@ public class TiffShortIntRoundTripTest extends TiffBaseTest {
"Extracted data does not match original, test "+name+": "
+ i + ", index " + j);
}
- final Map<String, Object> params = new HashMap<>();
- params.put(TiffConstants.PARAM_KEY_SUBIMAGE_X, 2);
- params.put(TiffConstants.PARAM_KEY_SUBIMAGE_Y, 2);
- params.put(TiffConstants.PARAM_KEY_SUBIMAGE_WIDTH, width-4);
- params.put(TiffConstants.PARAM_KEY_SUBIMAGE_HEIGHT, height-4);
+ final TiffImagingParameters params = new TiffImagingParameters();
+ params.setSubImage(2, 2, width-4, height-4);
TiffRasterData rdSub = directory.getRasterData(params);
assertEquals(width-4, rdSub.getWidth(), "Invalid sub-image width");
assertEquals(height-4, rdSub.getHeight(), "Invalid sub-image
height");
@@ -107,11 +101,8 @@ public class TiffShortIntRoundTripTest extends
TiffBaseTest {
assertEquals(a, b, "Sub Image test failed at (" + x + ","
+ y + ")");
}
}
- final Map<String, Object> xparams = new HashMap<>();
- xparams.put(TiffConstants.PARAM_KEY_SUBIMAGE_X, 2);
- xparams.put(TiffConstants.PARAM_KEY_SUBIMAGE_Y, 2);
- xparams.put(TiffConstants.PARAM_KEY_SUBIMAGE_WIDTH, width);
- xparams.put(TiffConstants.PARAM_KEY_SUBIMAGE_HEIGHT, height);
+ final TiffImagingParameters xparams = new TiffImagingParameters();
+ xparams.setSubImage(2, 2, width, height);
assertThrows(ImageReadException.class,
()->directory.getRasterData(xparams),
"Failed to catch bad subimage for test "+name);
}
diff --git
a/src/test/java/org/apache/commons/imaging/formats/tiff/TiffSubImageTest.java
b/src/test/java/org/apache/commons/imaging/formats/tiff/TiffSubImageTest.java
index 1f52ab0..05ffa30 100644
---
a/src/test/java/org/apache/commons/imaging/formats/tiff/TiffSubImageTest.java
+++
b/src/test/java/org/apache/commons/imaging/formats/tiff/TiffSubImageTest.java
@@ -74,7 +74,7 @@ public class TiffSubImageTest extends TiffBaseTest {
try{
final TiffImagingParameters params = new TiffImagingParameters();
params.setSubImage(x, y, width, height);
- final BufferedImage image = Imaging.getBufferedImage(target,
params);
+ Imaging.getBufferedImage(target, params);
fail("Reading TIFF sub-image failed to detect bad parameter:
"+comment);
}catch(final ImageReadException | IllegalArgumentException ire){
// the test passed
