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 9b17258f6bd10eaa69bd16f8ab6db22360628282
Author: Bruno P. Kinoshita <ki...@apache.org>
AuthorDate: Mon Jan 3 18:37:20 2022 +1300
[IMAGING-159] Jpeg parameter does not need to extend Tiff parameter
---
.../imaging/formats/jpeg/JpegImageParser.java | 39 ++++++++--------------
.../formats/jpeg/JpegImagingParameters.java | 4 +--
.../formats/jpeg/segments/App13Segment.java | 6 ++--
.../common/bytesource/ByteSourceImageTest.java | 15 ++++-----
.../tiff/ExampleReadFloatingPointData.java | 3 +-
.../examples/tiff/ReadAndRenderFloatingPoint.java | 6 ++--
.../imaging/examples/tiff/ReadTagsAndImages.java | 3 +-
.../commons/imaging/formats/jpeg/JpegReadTest.java | 11 +++---
.../imaging/formats/jpeg/exif/ExifDumpTest.java | 2 --
.../commons/imaging/formats/jpeg/exif/GpsTest.java | 2 --
.../formats/jpeg/exif/SpecificExifTagTest.java | 2 --
.../imaging/formats/jpeg/iptc/IptcAddTest.java | 2 --
.../imaging/formats/jpeg/iptc/IptcDumpTest.java | 2 --
.../imaging/formats/jpeg/iptc/IptcUpdateTest.java | 8 -----
14 files changed, 34 insertions(+), 71 deletions(-)
diff --git
a/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java
b/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java
index d541e6e..217e218 100644
--- a/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java
+++ b/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java
@@ -59,6 +59,7 @@ import
org.apache.commons.imaging.formats.jpeg.xmp.JpegXmpParser;
import org.apache.commons.imaging.formats.tiff.TiffField;
import org.apache.commons.imaging.formats.tiff.TiffImageMetadata;
import org.apache.commons.imaging.formats.tiff.TiffImageParser;
+import org.apache.commons.imaging.formats.tiff.TiffImagingParameters;
import org.apache.commons.imaging.formats.tiff.constants.TiffTagConstants;
import org.apache.commons.imaging.internal.Debug;
@@ -121,11 +122,8 @@ public class JpegImageParser extends
ImageParser<JpegImagingParameters> implemen
return false;
}
- public List<Segment> readSegments(final ByteSource byteSource,
- final int[] markers, final boolean returnAfterFirst,
- final boolean readEverything) throws ImageReadException,
IOException {
+ public List<Segment> readSegments(final ByteSource byteSource, final int[]
markers, final boolean returnAfterFirst) throws ImageReadException, IOException
{
final List<Segment> result = new ArrayList<>();
- final JpegImageParser parser = this;
final int[] sofnSegments = {
// kJFIFMarker,
JpegConstants.SOF0_MARKER,
@@ -178,7 +176,7 @@ public class JpegImageParser extends
ImageParser<JpegImagingParameters> implemen
switch (marker) {
case JpegConstants.JPEG_APP13_MARKER:
// Debug.debug("app 13 segment data", segmentData.length);
- result.add(new App13Segment(parser, marker, segmentData));
+ result.add(new App13Segment(marker, segmentData));
break;
case JpegConstants.JPEG_APP14_MARKER:
result.add(new App14Segment(marker, segmentData));
@@ -203,11 +201,7 @@ public class JpegImageParser extends
ImageParser<JpegImagingParameters> implemen
break;
}
- if (returnAfterFirst) {
- return false;
- }
-
- return true;
+ return !returnAfterFirst;
}
};
@@ -287,11 +281,6 @@ public class JpegImageParser extends
ImageParser<JpegImagingParameters> implemen
Debug.debug();
}
- public List<Segment> readSegments(final ByteSource byteSource, final int[]
markers,
- final boolean returnAfterFirst) throws ImageReadException,
IOException {
- return readSegments(byteSource, markers, returnAfterFirst, false);
- }
-
@Override
public byte[] getICCProfileBytes(final ByteSource byteSource, final
JpegImagingParameters params)
throws ImageReadException, IOException {
@@ -328,10 +317,9 @@ public class JpegImageParser extends
ImageParser<JpegImagingParameters> implemen
if (params == null) {
params = new JpegImagingParameters();
}
- final TiffImageMetadata exif = getExifMetadata(byteSource, params);
+ final TiffImageMetadata exif = getExifMetadata(byteSource, new
TiffImagingParameters());
- final JpegPhotoshopMetadata photoshop =
getPhotoshopMetadata(byteSource,
- params);
+ final JpegPhotoshopMetadata photoshop =
getPhotoshopMetadata(byteSource, params);
if (null == exif && null == photoshop) {
return null;
@@ -357,7 +345,7 @@ public class JpegImageParser extends
ImageParser<JpegImagingParameters> implemen
return result;
}
- public TiffImageMetadata getExifMetadata(final ByteSource byteSource,
JpegImagingParameters params)
+ public TiffImageMetadata getExifMetadata(final ByteSource byteSource,
TiffImagingParameters params)
throws ImageReadException, IOException {
final byte[] bytes = getExifRawData(byteSource);
if (null == bytes) {
@@ -365,12 +353,11 @@ public class JpegImageParser extends
ImageParser<JpegImagingParameters> implemen
}
if (params == null) {
- params = new JpegImagingParameters();
+ params = new TiffImagingParameters();
}
params.setReadThumbnails(Boolean.TRUE);
- return (TiffImageMetadata) new TiffImageParser().getMetadata(bytes,
- params);
+ return (TiffImageMetadata) new TiffImageParser().getMetadata(bytes,
params);
}
public byte[] getExifRawData(final ByteSource byteSource)
@@ -431,7 +418,7 @@ public class JpegImageParser extends
ImageParser<JpegImagingParameters> implemen
@Override
public boolean visitSegment(final int marker, final byte[]
markerBytes,
final int markerLength, final byte[] markerLengthBytes,
- final byte[] segmentData) throws ImageReadException,
IOException {
+ final byte[] segmentData) {
if (marker == 0xffd9) {
return false;
}
@@ -473,7 +460,7 @@ public class JpegImageParser extends
ImageParser<JpegImagingParameters> implemen
@Override
public boolean visitSegment(final int marker, final byte[]
markerBytes,
final int markerLength, final byte[] markerLengthBytes,
- final byte[] segmentData) throws ImageReadException,
IOException {
+ final byte[] segmentData) {
if (marker == 0xffd9) {
return false;
}
@@ -515,7 +502,7 @@ public class JpegImageParser extends
ImageParser<JpegImagingParameters> implemen
@Override
public boolean visitSegment(final int marker, final byte[]
markerBytes,
final int markerLength, final byte[] markerLengthBytes,
- final byte[] segmentData) throws ImageReadException,
IOException {
+ final byte[] segmentData) {
if (marker == 0xffd9) {
return false;
}
@@ -568,7 +555,7 @@ public class JpegImageParser extends
ImageParser<JpegImagingParameters> implemen
@Override
public boolean visitSegment(final int marker, final byte[]
markerBytes,
final int markerLength, final byte[] markerLengthBytes,
- final byte[] segmentData) throws ImageReadException,
IOException {
+ final byte[] segmentData) throws ImageReadException {
if (marker == 0xffd9) {
return false;
}
diff --git
a/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImagingParameters.java
b/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImagingParameters.java
index 4836b88..1fed2d6 100644
---
a/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImagingParameters.java
+++
b/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImagingParameters.java
@@ -15,10 +15,10 @@
package org.apache.commons.imaging.formats.jpeg;
-import org.apache.commons.imaging.formats.tiff.TiffImagingParameters;
+import org.apache.commons.imaging.common.XmpImagingParameters;
/**
* Jpeg format parameters.
* @since 1.0-alpha3
*/
-public class JpegImagingParameters extends TiffImagingParameters {}
+public class JpegImagingParameters extends XmpImagingParameters {}
diff --git
a/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/App13Segment.java
b/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/App13Segment.java
index 238a225..dffd880 100644
---
a/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/App13Segment.java
+++
b/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/App13Segment.java
@@ -22,16 +22,14 @@ import java.io.InputStream;
import org.apache.commons.imaging.ImageReadException;
import org.apache.commons.imaging.ImagingParameters;
-import org.apache.commons.imaging.formats.jpeg.JpegImageParser;
import org.apache.commons.imaging.formats.jpeg.iptc.IptcParser;
import org.apache.commons.imaging.formats.jpeg.iptc.PhotoshopApp13Data;
public class App13Segment extends AppnSegment {
- public App13Segment(final JpegImageParser parser, final int marker, final
byte[] segmentData)
+ public App13Segment(final int marker, final byte[] segmentData)
throws IOException {
- this(marker, segmentData.length, new ByteArrayInputStream(
- segmentData));
+ this(marker, segmentData.length, new
ByteArrayInputStream(segmentData));
}
public App13Segment(final int marker, final int markerLength,
diff --git
a/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceImageTest.java
b/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceImageTest.java
index 010811c..c6b453d 100644
---
a/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceImageTest.java
+++
b/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceImageTest.java
@@ -166,11 +166,10 @@ public class ByteSourceImageTest extends ByteSourceTest {
ImagingParameters params = null;
if (imageFormat == ImageFormats.TIFF) {
params = new TiffImagingParameters();
- ((TiffImagingParameters)
params).setReadThumbnails(Boolean.valueOf(!ignoreImageData));
+ ((TiffImagingParameters)
params).setReadThumbnails(!ignoreImageData);
}
if (imageFormat == ImageFormats.JPEG) {
params = new JpegImagingParameters();
- ((JpegImagingParameters)
params).setReadThumbnails(Boolean.valueOf(!ignoreImageData));
}
final ImageInfo imageInfoFile = Imaging.getImageInfo(imageFile,
params);
@@ -182,23 +181,21 @@ public class ByteSourceImageTest extends ByteSourceTest {
final Method[] methods = ImageInfo.class.getMethods();
for (final Method method2 : methods) {
- final Method method = method2;
- method.getModifiers();
- if (!Modifier.isPublic(method.getModifiers())) {
+ if (!Modifier.isPublic(method2.getModifiers())) {
continue;
}
- if (!method.getName().startsWith("get")) {
+ if (!method2.getName().startsWith("get")) {
continue;
}
- if (method.getName().equals("getClass"))
+ if (method2.getName().equals("getClass"))
{
continue;
// if (method.getGenericParameterTypes().length > 0)
// continue;
}
- final Object valueFile = method.invoke(imageInfoFile,
(Object[])null);
- final Object valueBytes = method.invoke(imageInfoBytes,
(Object[])null);
+ final Object valueFile = method2.invoke(imageInfoFile,
(Object[])null);
+ final Object valueBytes = method2.invoke(imageInfoBytes,
(Object[])null);
assertEquals(valueFile, valueBytes);
}
diff --git
a/src/test/java/org/apache/commons/imaging/examples/tiff/ExampleReadFloatingPointData.java
b/src/test/java/org/apache/commons/imaging/examples/tiff/ExampleReadFloatingPointData.java
index 42e56fc..816a557 100644
---
a/src/test/java/org/apache/commons/imaging/examples/tiff/ExampleReadFloatingPointData.java
+++
b/src/test/java/org/apache/commons/imaging/examples/tiff/ExampleReadFloatingPointData.java
@@ -32,6 +32,7 @@ import
org.apache.commons.imaging.common.bytesource.ByteSourceFile;
import org.apache.commons.imaging.formats.jpeg.JpegImagingParameters;
import org.apache.commons.imaging.formats.tiff.TiffContents;
import org.apache.commons.imaging.formats.tiff.TiffDirectory;
+import org.apache.commons.imaging.formats.tiff.TiffImagingParameters;
import org.apache.commons.imaging.formats.tiff.TiffRasterData;
import org.apache.commons.imaging.formats.tiff.TiffRasterStatistics;
import org.apache.commons.imaging.formats.tiff.TiffReader;
@@ -115,7 +116,7 @@ public class ExampleReadFloatingPointData {
// to specify what section of the data is to be extracted.
// See the Javadoc for readFloatingPointRasterData for more details.
final long time0Nanos = System.nanoTime();
- final JpegImagingParameters params = new JpegImagingParameters();
+ final TiffImagingParameters params = new TiffImagingParameters();
final TiffRasterData rasterData
= directory.getRasterData(params);
final long time1Nanos = System.nanoTime();
diff --git
a/src/test/java/org/apache/commons/imaging/examples/tiff/ReadAndRenderFloatingPoint.java
b/src/test/java/org/apache/commons/imaging/examples/tiff/ReadAndRenderFloatingPoint.java
index 68401e3..294326a 100644
---
a/src/test/java/org/apache/commons/imaging/examples/tiff/ReadAndRenderFloatingPoint.java
+++
b/src/test/java/org/apache/commons/imaging/examples/tiff/ReadAndRenderFloatingPoint.java
@@ -25,9 +25,9 @@ import javax.imageio.ImageIO;
import org.apache.commons.imaging.FormatCompliance;
import org.apache.commons.imaging.ImageReadException;
import org.apache.commons.imaging.common.bytesource.ByteSourceFile;
-import org.apache.commons.imaging.formats.jpeg.JpegImagingParameters;
import org.apache.commons.imaging.formats.tiff.TiffContents;
import org.apache.commons.imaging.formats.tiff.TiffDirectory;
+import org.apache.commons.imaging.formats.tiff.TiffImagingParameters;
import org.apache.commons.imaging.formats.tiff.TiffReader;
import org.apache.commons.imaging.formats.tiff.constants.TiffTagConstants;
import
org.apache.commons.imaging.formats.tiff.photometricinterpreters.floatingpoint.PhotometricInterpreterFloat;
@@ -146,7 +146,7 @@ public class ReadAndRenderFloatingPoint {
// For this demo, we store the Photometric Interpreter instance
// as a option-parameter to be passed into the read-image method.
final PhotometricInterpreterFloat pi = new
PhotometricInterpreterFloat(0.0f, 1.0f);
- JpegImagingParameters params = new JpegImagingParameters();
+ TiffImagingParameters params = new TiffImagingParameters();
params.setCustomPhotometricInterpreter(pi);
BufferedImage bImage = directory.getTiffImage(params);
@@ -162,7 +162,7 @@ public class ReadAndRenderFloatingPoint {
// of values found above.
final PhotometricInterpreterFloat grayScale
= new PhotometricInterpreterFloat(minValue, maxValue);
- params = new JpegImagingParameters();
+ params = new TiffImagingParameters();
params.setCustomPhotometricInterpreter(grayScale);
bImage = directory.getTiffImage(params);
ImageIO.write(bImage, "JPEG", output);
diff --git
a/src/test/java/org/apache/commons/imaging/examples/tiff/ReadTagsAndImages.java
b/src/test/java/org/apache/commons/imaging/examples/tiff/ReadTagsAndImages.java
index 070bfb5..ec92e03 100644
---
a/src/test/java/org/apache/commons/imaging/examples/tiff/ReadTagsAndImages.java
+++
b/src/test/java/org/apache/commons/imaging/examples/tiff/ReadTagsAndImages.java
@@ -30,6 +30,7 @@ import
org.apache.commons.imaging.formats.jpeg.JpegImagingParameters;
import org.apache.commons.imaging.formats.tiff.TiffContents;
import org.apache.commons.imaging.formats.tiff.TiffDirectory;
import org.apache.commons.imaging.formats.tiff.TiffField;
+import org.apache.commons.imaging.formats.tiff.TiffImagingParameters;
import org.apache.commons.imaging.formats.tiff.TiffReader;
import
org.apache.commons.imaging.formats.tiff.constants.GdalLibraryTagConstants;
import org.apache.commons.imaging.formats.tiff.constants.GeoTiffTagConstants;
@@ -82,7 +83,7 @@ public class ReadTagsAndImages {
= rootName != null && !rootName.isEmpty();
final ByteSourceFile byteSource = new ByteSourceFile(target);
- final JpegImagingParameters params = new JpegImagingParameters();
+ final TiffImagingParameters params = new TiffImagingParameters();
// Establish a TiffReader. This is just a simple constructor that
// does not actually access the file. So the application cannot
diff --git
a/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegReadTest.java
b/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegReadTest.java
index cf28e78..174ec35 100644
--- a/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegReadTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegReadTest.java
@@ -23,7 +23,6 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
import java.awt.image.BufferedImage;
import java.io.File;
-import java.io.IOException;
import java.util.stream.Stream;
import org.apache.commons.imaging.ImageInfo;
@@ -31,6 +30,7 @@ import org.apache.commons.imaging.ImageReadException;
import org.apache.commons.imaging.Imaging;
import org.apache.commons.imaging.common.ImageMetadata;
import org.apache.commons.imaging.common.bytesource.ByteSourceFile;
+import org.apache.commons.imaging.formats.tiff.TiffImagingParameters;
import org.apache.commons.imaging.internal.Debug;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
@@ -46,10 +46,9 @@ public class JpegReadTest extends JpegBaseTest {
@MethodSource("data")
public void test(final File imageFile) throws Exception {
final JpegImagingParameters params = new JpegImagingParameters();
- final boolean ignoreImageData = isPhilHarveyTestImage(imageFile);
- params.setReadThumbnails(!ignoreImageData);
- final ImageMetadata metadata = Imaging.getMetadata(imageFile, params);
+ JpegImageParser jpegImageParser = new JpegImageParser();
+ final ImageMetadata metadata = jpegImageParser.getExifMetadata(new
ByteSourceFile(imageFile), new TiffImagingParameters());
// TODO only run this tests with images that have metadata...
//assertNotNull(metadata);
Debug.debug("metadata", metadata);
@@ -76,11 +75,9 @@ public class JpegReadTest extends JpegBaseTest {
* throwing an ImageReadException instead.</p>
*
* <p>See Google OSS Fuzz issue 33458</p>
- *
- * @throws IOException if it fails to read the test image
*/
@Test
- public void testUncaughtExceptionOssFuzz33458() throws IOException {
+ public void testUncaughtExceptionOssFuzz33458() {
final String input =
"/images/jpeg/oss-fuzz-33458/clusterfuzz-testcase-minimized-ImagingJpegFuzzer-4548690447564800";
final String file = JpegReadTest.class.getResource(input).getFile();
final JpegImageParser parser = new JpegImageParser();
diff --git
a/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifDumpTest.java
b/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifDumpTest.java
index a01cab6..57675fc 100644
---
a/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifDumpTest.java
+++
b/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifDumpTest.java
@@ -51,8 +51,6 @@ public class ExifDumpTest extends ExifBaseTest {
@MethodSource("data")
public void testMetadata(final File imageFile) throws Exception {
final JpegImagingParameters params = new JpegImagingParameters();
- final boolean ignoreImageData = isPhilHarveyTestImage(imageFile);
- params.setReadThumbnails(!ignoreImageData);
final JpegImageMetadata metadata = (JpegImageMetadata)
Imaging.getMetadata(imageFile, params);
assertNotNull(metadata);
diff --git
a/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/GpsTest.java
b/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/GpsTest.java
index 51eec61..ee52a09 100644
--- a/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/GpsTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/GpsTest.java
@@ -42,8 +42,6 @@ public class GpsTest extends ExifBaseTest {
}
final JpegImagingParameters params = new JpegImagingParameters();
- final boolean ignoreImageData = isPhilHarveyTestImage(imageFile);
- params.setReadThumbnails(!ignoreImageData);
final JpegImageMetadata metadata = (JpegImageMetadata)
Imaging.getMetadata(imageFile, params);
if (null == metadata) {
diff --git
a/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/SpecificExifTagTest.java
b/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/SpecificExifTagTest.java
index aee2f84..babc710 100644
---
a/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/SpecificExifTagTest.java
+++
b/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/SpecificExifTagTest.java
@@ -56,8 +56,6 @@ public abstract class SpecificExifTagTest extends
ExifBaseTest {
// Debug.debug("imageFile", imageFile.getAbsoluteFile());
final JpegImagingParameters params = new JpegImagingParameters();
- final boolean ignoreImageData = isPhilHarveyTestImage(imageFile);
- params.setReadThumbnails(!ignoreImageData);
// note that metadata might be null if no metadata is found.
final ImageMetadata metadata = Imaging.getMetadata(imageFile, params);
diff --git
a/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcAddTest.java
b/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcAddTest.java
index 06476f2..fec6e2c 100644
---
a/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcAddTest.java
+++
b/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcAddTest.java
@@ -52,8 +52,6 @@ public class IptcAddTest extends IptcBaseTest {
final ByteSource byteSource = new ByteSourceFile(imageFile);
final JpegImagingParameters params = new JpegImagingParameters();
- final boolean ignoreImageData = isPhilHarveyTestImage(imageFile);
- params.setReadThumbnails(!ignoreImageData);
final JpegPhotoshopMetadata metadata = new
JpegImageParser().getPhotoshopMetadata(byteSource, params);
if (metadata == null) {
diff --git
a/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcDumpTest.java
b/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcDumpTest.java
index 0d4656f..99b8811 100644
---
a/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcDumpTest.java
+++
b/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcDumpTest.java
@@ -41,8 +41,6 @@ public class IptcDumpTest extends IptcBaseTest {
@MethodSource("data")
public void test(final File imageFile) throws Exception {
final JpegImagingParameters params = new JpegImagingParameters();
- final boolean ignoreImageData = isPhilHarveyTestImage(imageFile);
- params.setReadThumbnails(!ignoreImageData);
final JpegImageMetadata metadata = (JpegImageMetadata)
Imaging.getMetadata(imageFile, params);
assertNotNull(metadata);
diff --git
a/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcUpdateTest.java
b/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcUpdateTest.java
index 33abc91..b507905 100644
---
a/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcUpdateTest.java
+++
b/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcUpdateTest.java
@@ -55,8 +55,6 @@ public class IptcUpdateTest extends IptcBaseTest {
final ByteSource byteSource = new ByteSourceFile(imageFile);
final JpegImagingParameters params = new JpegImagingParameters();
- final boolean ignoreImageData = isPhilHarveyTestImage(imageFile);
- params.setReadThumbnails(!ignoreImageData);
final JpegPhotoshopMetadata metadata = new
JpegImageParser().getPhotoshopMetadata(
byteSource, params);
@@ -87,8 +85,6 @@ public class IptcUpdateTest extends IptcBaseTest {
final ByteSource byteSource = new ByteSourceFile(imageFile);
final JpegImagingParameters params = new JpegImagingParameters();
- final boolean ignoreImageData = isPhilHarveyTestImage(imageFile);
- params.setReadThumbnails(!ignoreImageData);
final JpegPhotoshopMetadata metadata = new
JpegImageParser().getPhotoshopMetadata(
byteSource, params);
@@ -128,8 +124,6 @@ public class IptcUpdateTest extends IptcBaseTest {
final ByteSource byteSource = new ByteSourceFile(imageFile);
final JpegImagingParameters params = new JpegImagingParameters();
- final boolean ignoreImageData = isPhilHarveyTestImage(imageFile);
- params.setReadThumbnails(!ignoreImageData);
final JpegPhotoshopMetadata metadata = new
JpegImageParser().getPhotoshopMetadata(byteSource, params);
assertNotNull(metadata);
@@ -170,8 +164,6 @@ public class IptcUpdateTest extends IptcBaseTest {
final ByteSource byteSource = new ByteSourceFile(imageFile);
final JpegImagingParameters params = new JpegImagingParameters();
- final boolean ignoreImageData = isPhilHarveyTestImage(imageFile);
- params.setReadThumbnails(!ignoreImageData);
final JpegPhotoshopMetadata metadata = new
JpegImageParser().getPhotoshopMetadata(byteSource, params);
assertNotNull(metadata);
