From bd796429c5e4eeb253b63e18ddb26638f08e0f7a Mon Sep 17 00:00:00 2001 From: Harald Kuhr Date: Sat, 10 Apr 2021 18:14:09 +0200 Subject: [PATCH] #573: Better naming: LuminanceToGray --- .../imageio/plugins/jpeg/JPEGImageReader.java | 2 +- .../jpeg/{LumaToGray.java => LuminanceToGray.java} | 2 +- .../{LumaToGrayTest.java => LuminanceToGrayTest.java} | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) rename imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/{LumaToGray.java => LuminanceToGray.java} (97%) rename imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/{LumaToGrayTest.java => LuminanceToGrayTest.java} (93%) 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 53a89217..a09fd4b3 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 @@ -421,7 +421,7 @@ public final class JPEGImageReader extends ImageReaderBase { ICC_ColorSpace intendedCS = profile != null ? ColorSpaces.createColorSpace(profile) : null; if (destination.getNumBands() <= 2 && (csType != JPEGColorSpace.Gray && csType != JPEGColorSpace.GrayA)) { - convert = new LumaToGray(); + convert = new LuminanceToGray(); } else if (profile != null && (csType == JPEGColorSpace.Gray || csType == JPEGColorSpace.GrayA)) { // com.sun. reader does not do ColorConvertOp for CS_GRAY, even if embedded ICC profile, diff --git a/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/LumaToGray.java b/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/LuminanceToGray.java similarity index 97% rename from imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/LumaToGray.java rename to imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/LuminanceToGray.java index 29327289..9b24dcca 100644 --- a/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/LumaToGray.java +++ b/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/LuminanceToGray.java @@ -16,7 +16,7 @@ import java.awt.image.WritableRaster; * @author last modified by $Author: haraldk$ * @version $Id: LumaToGray.java,v 1.0 10/04/2021 haraldk Exp$ */ -final class LumaToGray implements RasterOp { +final class LuminanceToGray implements RasterOp { @Override public WritableRaster filter(final Raster src, WritableRaster dest) { diff --git a/imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/LumaToGrayTest.java b/imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/LuminanceToGrayTest.java similarity index 93% rename from imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/LumaToGrayTest.java rename to imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/LuminanceToGrayTest.java index 856461b3..a6485fda 100644 --- a/imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/LumaToGrayTest.java +++ b/imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/LuminanceToGrayTest.java @@ -16,10 +16,10 @@ import static org.junit.Assert.*; * @author last modified by $Author: haraldk$ * @version $Id: LumaToGrayTest.java,v 1.0 10/04/2021 haraldk Exp$ */ -public class LumaToGrayTest { +public class LuminanceToGrayTest { @Test public void testConvertByteYcc() { - LumaToGray convert = new LumaToGray(); + LuminanceToGray convert = new LuminanceToGray(); WritableRaster input = Raster.createInterleavedRaster(DataBuffer.TYPE_BYTE, 1, 1, 3, null); WritableRaster result = null; @@ -39,7 +39,7 @@ public class LumaToGrayTest { @Test public void testConvertByteYccK() { - LumaToGray convert = new LumaToGray(); + LuminanceToGray convert = new LuminanceToGray(); WritableRaster input = Raster.createInterleavedRaster(DataBuffer.TYPE_BYTE, 1, 1, 4, null); WritableRaster result = null; @@ -59,7 +59,7 @@ public class LumaToGrayTest { @Test public void testConvertByteYccA() { - LumaToGray convert = new LumaToGray(); + LuminanceToGray convert = new LuminanceToGray(); WritableRaster input = Raster.createInterleavedRaster(DataBuffer.TYPE_BYTE, 1, 1, 4, null); WritableRaster result = Raster.createInterleavedRaster(DataBuffer.TYPE_BYTE, 1, 1, 2, null);