From f666610184f893fc7c858d53e633e8d4bd4151cf Mon Sep 17 00:00:00 2001 From: Harald Kuhr Date: Thu, 31 Jan 2013 15:40:08 +0100 Subject: [PATCH] TMI-TIFF: New tag + fixed spelling for tag. --- .../imageio/plugins/jpeg/EXIFThumbnailReader.java | 2 +- .../com/twelvemonkeys/imageio/metadata/exif/EXIFEntry.java | 2 +- .../java/com/twelvemonkeys/imageio/metadata/exif/TIFF.java | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) 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 d18dbdf6..1eaba702 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 @@ -147,7 +147,7 @@ final class EXIFThumbnailReader extends ThumbnailReader { } Entry bitsPerSample = ifd.getEntryById(TIFF.TAG_BITS_PER_SAMPLE); - Entry samplesPerPixel = ifd.getEntryById(TIFF.TAG_SAMPLES_PER_PIXELS); + Entry samplesPerPixel = ifd.getEntryById(TIFF.TAG_SAMPLES_PER_PIXEL); Entry photometricInterpretation = ifd.getEntryById(TIFF.TAG_PHOTOMETRIC_INTERPRETATION); // Required diff --git a/imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/exif/EXIFEntry.java b/imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/exif/EXIFEntry.java index efa13180..d2c77af6 100644 --- a/imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/exif/EXIFEntry.java +++ b/imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/exif/EXIFEntry.java @@ -88,7 +88,7 @@ final class EXIFEntry extends AbstractEntry { return "StripOffsets"; case TIFF.TAG_ORIENTATION: return "Orientation"; - case TIFF.TAG_SAMPLES_PER_PIXELS: + case TIFF.TAG_SAMPLES_PER_PIXEL: return "SamplesPerPixels"; case TIFF.TAG_ROWS_PER_STRIP: return "RowsPerStrip"; diff --git a/imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/exif/TIFF.java b/imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/exif/TIFF.java index b60e2955..db3521d2 100644 --- a/imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/exif/TIFF.java +++ b/imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/exif/TIFF.java @@ -99,7 +99,7 @@ public interface TIFF { int TAG_COMPRESSION = 259; int TAG_PHOTOMETRIC_INTERPRETATION = 262; int TAG_ORIENTATION = 274; - int TAG_SAMPLES_PER_PIXELS = 277; + int TAG_SAMPLES_PER_PIXEL = 277; int TAG_PLANAR_CONFIGURATION = 284; int TAG_SAMPLE_FORMAT = 339; int TAG_YCBCR_SUB_SAMPLING = 530; @@ -124,6 +124,7 @@ public interface TIFF { int TAG_PRIMARY_CHROMATICITIES = 319; int TAG_COLOR_MAP = 320; int TAG_EXTRA_SAMPLES = 338; + int TAG_TRANSFER_RANGE = 342; int TAG_YCBCR_COEFFICIENTS = 529; int TAG_REFERENCE_BLACK_WHITE = 532;