From 10b8c11a8e362ea8e4d57c0226ed328eae98edc8 Mon Sep 17 00:00:00 2001 From: Harald Kuhr Date: Wed, 18 Jan 2017 18:04:12 +0100 Subject: [PATCH] Code clean-up. --- .../tiff/HorizontalDeDifferencingStream.java | 17 ++--------------- .../tiff/HorizontalDifferencingStream.java | 2 +- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/imageio/imageio-tiff/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/HorizontalDeDifferencingStream.java b/imageio/imageio-tiff/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/HorizontalDeDifferencingStream.java index b4e9ce79..096c4e9d 100644 --- a/imageio/imageio-tiff/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/HorizontalDeDifferencingStream.java +++ b/imageio/imageio-tiff/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/HorizontalDeDifferencingStream.java @@ -38,6 +38,8 @@ import java.nio.ByteOrder; import java.nio.channels.Channels; import java.nio.channels.ReadableByteChannel; +import static com.twelvemonkeys.imageio.plugins.tiff.HorizontalDifferencingStream.isValidBPS; + /** * A decoder for data converted using "horizontal differencing predictor". * @@ -67,21 +69,6 @@ final class HorizontalDeDifferencingStream extends InputStream { buffer.flip(); } - private boolean isValidBPS(final int bitsPerSample) { - switch (bitsPerSample) { - case 1: - case 2: - case 4: - case 8: - case 16: - case 32: - case 64: - return true; - default: - return false; - } - } - @SuppressWarnings("StatementWithEmptyBody") private boolean fetch() throws IOException { buffer.clear(); diff --git a/imageio/imageio-tiff/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/HorizontalDifferencingStream.java b/imageio/imageio-tiff/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/HorizontalDifferencingStream.java index 7a8943f1..0daeeea6 100644 --- a/imageio/imageio-tiff/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/HorizontalDifferencingStream.java +++ b/imageio/imageio-tiff/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/HorizontalDifferencingStream.java @@ -66,7 +66,7 @@ final class HorizontalDifferencingStream extends OutputStream { buffer = ByteBuffer.allocate((columns * samplesPerPixel * bitsPerSample + 7) / 8).order(byteOrder); } - private boolean isValidBPS(final int bitsPerSample) { + static boolean isValidBPS(final int bitsPerSample) { switch (bitsPerSample) { case 1: case 2: