From 51afe2d2e89b624904f03ef6fa60db104532f39d Mon Sep 17 00:00:00 2001 From: Harald Kuhr Date: Fri, 9 Sep 2016 13:37:29 +0200 Subject: [PATCH] #182 Code clean up. --- .../twelvemonkeys/imageio/plugins/jpeg/AdobeDCT.java | 2 +- .../imageio/plugins/jpeg/EXIFThumbnailReader.java | 4 ++-- .../com/twelvemonkeys/imageio/plugins/jpeg/JFIF.java | 10 ---------- .../imageio/plugins/jpeg/JFIFThumbnailReader.java | 2 +- .../imageio/plugins/jpeg/JFXXThumbnailReader.java | 4 ++-- 5 files changed, 6 insertions(+), 16 deletions(-) diff --git a/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/AdobeDCT.java b/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/AdobeDCT.java index 22cbc6c1..bae9d248 100644 --- a/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/AdobeDCT.java +++ b/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/AdobeDCT.java @@ -70,7 +70,7 @@ final class AdobeDCT extends Application { public static AdobeDCT read(final DataInput data, final int length) throws IOException { // TODO: Investigate http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6355567: 33/35 byte Adobe APP14 markers - data.skipBytes(6); + data.skipBytes(6); // A, d, o, b, e, \0 // version (byte), flags (4bytes), color transform (byte: 0=unknown, 1=YCC, 2=YCCK) return new AdobeDCT( diff --git a/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/EXIFThumbnailReader.java b/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/EXIFThumbnailReader.java index 20b5b50b..fe249093 100644 --- a/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/EXIFThumbnailReader.java +++ b/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/EXIFThumbnailReader.java @@ -62,7 +62,7 @@ final class EXIFThumbnailReader extends ThumbnailReader { private transient SoftReference cachedThumbnail; - public EXIFThumbnailReader(ThumbnailReadProgressListener progressListener, ImageReader jpegReader, int imageIndex, int thumbnailIndex, Directory ifd, ImageInputStream stream) { + EXIFThumbnailReader(final ThumbnailReadProgressListener progressListener, final ImageReader jpegReader, final int imageIndex, final int thumbnailIndex, final Directory ifd, final ImageInputStream stream) { super(progressListener, imageIndex, thumbnailIndex); this.reader = Validate.notNull(jpegReader); this.ifd = ifd; @@ -96,7 +96,7 @@ final class EXIFThumbnailReader extends ThumbnailReader { } } - private BufferedImage readJPEGCached(boolean pixelsExposed) throws IOException { + private BufferedImage readJPEGCached(final boolean pixelsExposed) throws IOException { BufferedImage thumbnail = cachedThumbnail != null ? cachedThumbnail.get() : null; if (thumbnail == null) { diff --git a/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JFIF.java b/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JFIF.java index e20d5289..e3093b39 100644 --- a/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JFIF.java +++ b/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JFIF.java @@ -114,16 +114,6 @@ final class JFIF extends Application { getBytes(buffer, x * y * 3), bytes ); -// return new JFIF( -// data.readUnsignedByte(), -// data.readUnsignedByte(), -// data.readUnsignedByte(), -// data.readUnsignedShort(), -// data.readUnsignedShort(), -// x = data.readUnsignedByte(), -// y = data.readUnsignedByte(), -// JPEGImageReader.readFully(data, x * y * 3) -// ); } private static byte[] getBytes(ByteBuffer buffer, int len) { diff --git a/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JFIFThumbnailReader.java b/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JFIFThumbnailReader.java index ef16d460..14e71e46 100644 --- a/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JFIFThumbnailReader.java +++ b/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JFIFThumbnailReader.java @@ -41,7 +41,7 @@ import java.io.IOException; final class JFIFThumbnailReader extends ThumbnailReader { private final JFIF segment; - public JFIFThumbnailReader(ThumbnailReadProgressListener progressListener, int imageIndex, int thumbnailIndex, JFIF segment) { + JFIFThumbnailReader(final ThumbnailReadProgressListener progressListener, final int imageIndex, final int thumbnailIndex, final JFIF segment) { super(progressListener, imageIndex, thumbnailIndex); this.segment = segment; } diff --git a/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JFXXThumbnailReader.java b/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JFXXThumbnailReader.java index 0d47d1ca..92a0b844 100644 --- a/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JFXXThumbnailReader.java +++ b/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JFXXThumbnailReader.java @@ -54,7 +54,7 @@ final class JFXXThumbnailReader extends ThumbnailReader { private transient SoftReference cachedThumbnail; - protected JFXXThumbnailReader(final ThumbnailReadProgressListener progressListener, ImageReader jpegReader, final int imageIndex, final int thumbnailIndex, final JFXX segment) { + JFXXThumbnailReader(final ThumbnailReadProgressListener progressListener, final ImageReader jpegReader, final int imageIndex, final int thumbnailIndex, final JFXX segment) { super(progressListener, imageIndex, thumbnailIndex); this.reader = Validate.notNull(jpegReader); this.segment = segment; @@ -85,7 +85,7 @@ final class JFXXThumbnailReader extends ThumbnailReader { return thumbnail; } - public IIOMetadata readMetadata() throws IOException { + IIOMetadata readMetadata() throws IOException { ImageInputStream input = new ByteArrayImageInputStream(segment.thumbnail); try {