From a1fcfc39584a9df452bdb5c5cd467d31e003f2b9 Mon Sep 17 00:00:00 2001 From: Harald Kuhr Date: Fri, 9 Sep 2022 14:09:58 +0200 Subject: [PATCH] Fix WebP visibility issues. --- .../lossless/{transform => }/ColorIndexingTransform.java | 4 ++-- .../webp/lossless/{transform => }/ColorTransform.java | 4 ++-- .../webp/lossless/{huffman => }/HuffmanCodeGroup.java | 4 ++-- .../plugins/webp/lossless/{huffman => }/HuffmanInfo.java | 4 ++-- .../plugins/webp/lossless/{huffman => }/HuffmanTable.java | 4 ++-- .../webp/lossless/{transform => }/PredictorMode.java | 4 ++-- .../webp/lossless/{transform => }/PredictorTransform.java | 4 ++-- .../lossless/{transform => }/SubtractGreenTransform.java | 4 ++-- .../plugins/webp/lossless/{transform => }/Transform.java | 6 +++--- .../webp/lossless/{transform => }/TransformType.java | 4 ++-- .../imageio/plugins/webp/lossless/VP8LDecoder.java | 8 -------- 11 files changed, 21 insertions(+), 29 deletions(-) rename imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/{transform => }/ColorIndexingTransform.java (95%) rename imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/{transform => }/ColorTransform.java (97%) rename imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/{huffman => }/HuffmanCodeGroup.java (96%) rename imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/{huffman => }/HuffmanInfo.java (95%) rename imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/{huffman => }/HuffmanTable.java (99%) rename imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/{transform => }/PredictorMode.java (96%) rename imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/{transform => }/PredictorTransform.java (98%) rename imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/{transform => }/SubtractGreenTransform.java (94%) rename imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/{transform => }/Transform.java (92%) rename imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/{transform => }/TransformType.java (94%) diff --git a/imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/transform/ColorIndexingTransform.java b/imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/ColorIndexingTransform.java similarity index 95% rename from imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/transform/ColorIndexingTransform.java rename to imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/ColorIndexingTransform.java index 71578554..e92af39f 100644 --- a/imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/transform/ColorIndexingTransform.java +++ b/imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/ColorIndexingTransform.java @@ -29,14 +29,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ -package com.twelvemonkeys.imageio.plugins.webp.lossless.transform; +package com.twelvemonkeys.imageio.plugins.webp.lossless; import java.awt.image.*; /** * @author Simon Kammermeier */ -public class ColorIndexingTransform implements Transform { +final class ColorIndexingTransform implements Transform { private final byte[] colorTable; private final byte bits; diff --git a/imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/transform/ColorTransform.java b/imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/ColorTransform.java similarity index 97% rename from imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/transform/ColorTransform.java rename to imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/ColorTransform.java index 33a016fa..d78bf423 100644 --- a/imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/transform/ColorTransform.java +++ b/imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/ColorTransform.java @@ -29,14 +29,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ -package com.twelvemonkeys.imageio.plugins.webp.lossless.transform; +package com.twelvemonkeys.imageio.plugins.webp.lossless; import java.awt.image.*; /** * @author Simon Kammermeier */ -public class ColorTransform implements Transform { +final class ColorTransform implements Transform { private final Raster data; private final byte bits; diff --git a/imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/huffman/HuffmanCodeGroup.java b/imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/HuffmanCodeGroup.java similarity index 96% rename from imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/huffman/HuffmanCodeGroup.java rename to imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/HuffmanCodeGroup.java index 5e7fe232..4b534923 100644 --- a/imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/huffman/HuffmanCodeGroup.java +++ b/imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/HuffmanCodeGroup.java @@ -29,7 +29,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -package com.twelvemonkeys.imageio.plugins.webp.lossless.huffman; +package com.twelvemonkeys.imageio.plugins.webp.lossless; import com.twelvemonkeys.imageio.plugins.webp.LSBBitReader; @@ -38,7 +38,7 @@ import java.io.IOException; /** * @author Simon Kammermeier */ -public class HuffmanCodeGroup { +final class HuffmanCodeGroup { /** * Used for green, backward reference length and color cache */ diff --git a/imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/huffman/HuffmanInfo.java b/imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/HuffmanInfo.java similarity index 95% rename from imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/huffman/HuffmanInfo.java rename to imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/HuffmanInfo.java index b9105bbf..b0b2b7d9 100644 --- a/imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/huffman/HuffmanInfo.java +++ b/imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/HuffmanInfo.java @@ -29,14 +29,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ -package com.twelvemonkeys.imageio.plugins.webp.lossless.huffman; +package com.twelvemonkeys.imageio.plugins.webp.lossless; import java.awt.image.*; /** * @author Simon Kammermeier */ -public class HuffmanInfo { +final class HuffmanInfo { public Raster huffmanMetaCodes; //Raster allows intuitive lookup by x and y public int metaCodeBits; diff --git a/imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/huffman/HuffmanTable.java b/imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/HuffmanTable.java similarity index 99% rename from imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/huffman/HuffmanTable.java rename to imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/HuffmanTable.java index d1e9799f..590b8758 100644 --- a/imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/huffman/HuffmanTable.java +++ b/imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/HuffmanTable.java @@ -29,7 +29,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -package com.twelvemonkeys.imageio.plugins.webp.lossless.huffman; +package com.twelvemonkeys.imageio.plugins.webp.lossless; import com.twelvemonkeys.imageio.plugins.webp.LSBBitReader; @@ -65,7 +65,7 @@ import java.util.List; * * @author Simon Kammermeier */ -public class HuffmanTable { +final class HuffmanTable { private static final int LEVEL1_BITS = 8; /** diff --git a/imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/transform/PredictorMode.java b/imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/PredictorMode.java similarity index 96% rename from imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/transform/PredictorMode.java rename to imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/PredictorMode.java index d3e0bca1..140642ae 100644 --- a/imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/transform/PredictorMode.java +++ b/imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/PredictorMode.java @@ -29,14 +29,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ -package com.twelvemonkeys.imageio.plugins.webp.lossless.transform; +package com.twelvemonkeys.imageio.plugins.webp.lossless; /** * PredictorMode. * * @author Harald Kuhr */ -public interface PredictorMode { +interface PredictorMode { // Special rules: // Top-left pixel of image is predicted BLACK // Rest of top pixels is predicted L diff --git a/imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/transform/PredictorTransform.java b/imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/PredictorTransform.java similarity index 98% rename from imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/transform/PredictorTransform.java rename to imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/PredictorTransform.java index d099c9bc..6b023b40 100644 --- a/imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/transform/PredictorTransform.java +++ b/imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/PredictorTransform.java @@ -29,7 +29,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -package com.twelvemonkeys.imageio.plugins.webp.lossless.transform; +package com.twelvemonkeys.imageio.plugins.webp.lossless; import java.awt.image.*; @@ -40,7 +40,7 @@ import static java.lang.Math.min; /** * @author Simon Kammermeier */ -public class PredictorTransform implements Transform { +final class PredictorTransform implements Transform { private final Raster data; private final byte bits; diff --git a/imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/transform/SubtractGreenTransform.java b/imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/SubtractGreenTransform.java similarity index 94% rename from imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/transform/SubtractGreenTransform.java rename to imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/SubtractGreenTransform.java index 9b86f5e6..d61d7edc 100644 --- a/imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/transform/SubtractGreenTransform.java +++ b/imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/SubtractGreenTransform.java @@ -29,14 +29,14 @@ * POSSIBILITY OF SUCH DAMAGE. */ -package com.twelvemonkeys.imageio.plugins.webp.lossless.transform; +package com.twelvemonkeys.imageio.plugins.webp.lossless; import java.awt.image.*; /** * @author Simon Kammermeier */ -public class SubtractGreenTransform implements Transform { +final class SubtractGreenTransform implements Transform { private static void addGreenToBlueAndRed(byte[] rgb) { rgb[0] = (byte) ((rgb[0] + rgb[1]) & 0xff); diff --git a/imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/transform/Transform.java b/imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/Transform.java similarity index 92% rename from imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/transform/Transform.java rename to imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/Transform.java index 98394f1e..5d91f947 100644 --- a/imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/transform/Transform.java +++ b/imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/Transform.java @@ -29,16 +29,16 @@ * POSSIBILITY OF SUCH DAMAGE. */ -package com.twelvemonkeys.imageio.plugins.webp.lossless.transform; +package com.twelvemonkeys.imageio.plugins.webp.lossless; -import java.awt.image.WritableRaster; +import java.awt.image.*; /** * Transform. * * @author Harald Kuhr */ -public interface Transform { +interface Transform { void applyInverse(WritableRaster raster); } diff --git a/imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/transform/TransformType.java b/imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/TransformType.java similarity index 94% rename from imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/transform/TransformType.java rename to imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/TransformType.java index 18ba23e6..525a6fa8 100644 --- a/imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/transform/TransformType.java +++ b/imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/TransformType.java @@ -29,7 +29,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -package com.twelvemonkeys.imageio.plugins.webp.lossless.transform; +package com.twelvemonkeys.imageio.plugins.webp.lossless; /** * TransformType. @@ -37,7 +37,7 @@ package com.twelvemonkeys.imageio.plugins.webp.lossless.transform; * @author Harald Kuhr */ // Hmm.. Why doesn't SUBTRACT_GREEN follow the convention? -public interface TransformType { +interface TransformType { int PREDICTOR_TRANSFORM = 0; int COLOR_TRANSFORM = 1; int SUBTRACT_GREEN = 2; diff --git a/imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/VP8LDecoder.java b/imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/VP8LDecoder.java index 389063d1..5930faa5 100644 --- a/imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/VP8LDecoder.java +++ b/imageio/imageio-webp/src/main/java/com/twelvemonkeys/imageio/plugins/webp/lossless/VP8LDecoder.java @@ -32,14 +32,6 @@ package com.twelvemonkeys.imageio.plugins.webp.lossless; import com.twelvemonkeys.imageio.plugins.webp.LSBBitReader; -import com.twelvemonkeys.imageio.plugins.webp.lossless.huffman.HuffmanCodeGroup; -import com.twelvemonkeys.imageio.plugins.webp.lossless.huffman.HuffmanInfo; -import com.twelvemonkeys.imageio.plugins.webp.lossless.transform.ColorIndexingTransform; -import com.twelvemonkeys.imageio.plugins.webp.lossless.transform.ColorTransform; -import com.twelvemonkeys.imageio.plugins.webp.lossless.transform.PredictorTransform; -import com.twelvemonkeys.imageio.plugins.webp.lossless.transform.SubtractGreenTransform; -import com.twelvemonkeys.imageio.plugins.webp.lossless.transform.Transform; -import com.twelvemonkeys.imageio.plugins.webp.lossless.transform.TransformType; import javax.imageio.IIOException; import javax.imageio.ImageReadParam;