From 910f9fafc77b5f9ff4bd38f5d6c133cdf96df39b Mon Sep 17 00:00:00 2001 From: Harald Kuhr Date: Tue, 19 Dec 2017 20:32:26 +0100 Subject: [PATCH] #397 ColorSpaceType value -> name --- .../plugins/tiff/TIFFImageMetadata.java | 18 +++++++++--------- .../plugins/tiff/TIFFImageMetadataTest.java | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/imageio/imageio-tiff/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageMetadata.java b/imageio/imageio-tiff/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageMetadata.java index 6de78164..805ac2e2 100644 --- a/imageio/imageio-tiff/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageMetadata.java +++ b/imageio/imageio-tiff/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageMetadata.java @@ -361,39 +361,39 @@ public final class TIFFImageMetadata extends AbstractMetadata { case TIFFBaseline.PHOTOMETRIC_WHITE_IS_ZERO: case TIFFBaseline.PHOTOMETRIC_BLACK_IS_ZERO: case TIFFBaseline.PHOTOMETRIC_MASK: // It's really a transparency mask/alpha channel, but... - colorSpaceType.setAttribute("value", "GRAY"); + colorSpaceType.setAttribute("name", "GRAY"); break; case TIFFBaseline.PHOTOMETRIC_RGB: case TIFFBaseline.PHOTOMETRIC_PALETTE: - colorSpaceType.setAttribute("value", "RGB"); + colorSpaceType.setAttribute("name", "RGB"); break; case TIFFExtension.PHOTOMETRIC_YCBCR: - colorSpaceType.setAttribute("value", "YCbCr"); + colorSpaceType.setAttribute("name", "YCbCr"); break; case TIFFExtension.PHOTOMETRIC_CIELAB: case TIFFExtension.PHOTOMETRIC_ICCLAB: case TIFFExtension.PHOTOMETRIC_ITULAB: - colorSpaceType.setAttribute("value", "Lab"); + colorSpaceType.setAttribute("name", "Lab"); break; case TIFFExtension.PHOTOMETRIC_SEPARATED: // TODO: May be CMYK, or something else... Consult InkSet and NumberOfInks! if (numChannelsValue == 3) { - colorSpaceType.setAttribute("value", "CMY"); + colorSpaceType.setAttribute("name", "CMY"); } else { - colorSpaceType.setAttribute("value", "CMYK"); + colorSpaceType.setAttribute("name", "CMYK"); } break; case TIFFCustom.PHOTOMETRIC_LOGL: // ..? case TIFFCustom.PHOTOMETRIC_LOGLUV: - colorSpaceType.setAttribute("value", "Luv"); + colorSpaceType.setAttribute("name", "Luv"); break; case TIFFCustom.PHOTOMETRIC_CFA: case TIFFCustom.PHOTOMETRIC_LINEAR_RAW: // ...or is this RGB? - colorSpaceType.setAttribute("value", "3CLR"); + colorSpaceType.setAttribute("name", "3CLR"); break; default: - colorSpaceType.setAttribute("value", Integer.toHexString(numChannelsValue) + "CLR"); + colorSpaceType.setAttribute("name", Integer.toHexString(numChannelsValue) + "CLR"); break; } diff --git a/imageio/imageio-tiff/src/test/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageMetadataTest.java b/imageio/imageio-tiff/src/test/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageMetadataTest.java index 4256230c..bd54b0b9 100644 --- a/imageio/imageio-tiff/src/test/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageMetadataTest.java +++ b/imageio/imageio-tiff/src/test/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageMetadataTest.java @@ -74,7 +74,7 @@ public class TIFFImageMetadataTest { Node colorSpaceType = chroma.getFirstChild(); assertEquals("ColorSpaceType", colorSpaceType.getNodeName()); - assertEquals("YCbCr", ((Element) colorSpaceType).getAttribute("value")); + assertEquals("YCbCr", ((Element) colorSpaceType).getAttribute("name")); Node numChannels = colorSpaceType.getNextSibling(); assertEquals("NumChannels", numChannels.getNodeName());