diff --git a/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/Application.java b/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/Application.java index 2a205ba6..80e07237 100644 --- a/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/Application.java +++ b/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/Application.java @@ -29,7 +29,6 @@ package com.twelvemonkeys.imageio.plugins.jpeg; import com.twelvemonkeys.imageio.metadata.jpeg.JPEG; -import com.twelvemonkeys.lang.Validate; import java.io.ByteArrayInputStream; import java.io.DataInput; @@ -48,10 +47,10 @@ class Application extends Segment { final String identifier; final byte[] data; - Application(int marker, final String identifier, final byte[] data) { + Application(final int marker, final String identifier, final byte[] data) { super(marker); - this.identifier = Validate.notEmpty(identifier, "identifier"); + this.identifier = identifier; // NOTE: Some JPEGs contain APP segments without NULL-terminated identifier this.data = data; } diff --git a/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReader.java b/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReader.java index 5cf4ed9b..07a79b97 100644 --- a/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReader.java +++ b/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReader.java @@ -723,7 +723,7 @@ public final class JPEGImageReader extends ImageReaderBase { catch (IOException e) { // TODO: Handle bad segments better, for now, just ignore any bad APP markers if (segment.marker() >= JPEG.APP0 && JPEG.APP15 >= segment.marker()) { - processWarningOccurred("Bogus " +segment.identifier() + " segment, ignoring"); + processWarningOccurred("Bogus APP" + (segment.marker() & 0x0f) + "/" + segment.identifier() + " segment, ignoring"); continue; } diff --git a/imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReaderTest.java b/imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReaderTest.java index c502d5a2..dbf722e5 100644 --- a/imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReaderTest.java +++ b/imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReaderTest.java @@ -95,6 +95,7 @@ public class JPEGImageReaderTest extends ImageReaderAbstractTest