From cc604e650b81acf3045d8af1a1bc91d3bd639607 Mon Sep 17 00:00:00 2001 From: Harald Kuhr Date: Mon, 18 Feb 2013 14:51:45 +0100 Subject: [PATCH] TMI-TIFF: Added more constants + debugging code for field names + suppressed unwanted warnings. --- .../imageio/metadata/exif/EXIF.java | 1 + .../imageio/metadata/exif/EXIFEntry.java | 22 +++++++++++++++++++ .../imageio/metadata/exif/TIFF.java | 9 +++++--- 3 files changed, 29 insertions(+), 3 deletions(-) diff --git a/imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/exif/EXIF.java b/imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/exif/EXIF.java index 9ebda2ab..7ad54e97 100644 --- a/imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/exif/EXIF.java +++ b/imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/exif/EXIF.java @@ -35,6 +35,7 @@ package com.twelvemonkeys.imageio.metadata.exif; * @author last modified by $Author: haraldk$ * @version $Id: EXIF.java,v 1.0 Nov 11, 2009 5:36:04 PM haraldk Exp$ */ +@SuppressWarnings("UnusedDeclaration") public interface EXIF { // See http://www.awaresystems.be/imaging/tiff/tifftags/privateifd/exif.html int TAG_EXPOSURE_TIME = 33434; 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 d2c77af6..cf10da19 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 @@ -209,6 +209,28 @@ final class EXIFEntry extends AbstractEntry { return "PixelYDimension"; // TODO: More field names + /* + default: + Class[] classes = new Class[] {TIFF.class, EXIF.class}; + + for (Class cl : classes) { + Field[] fields = cl.getFields(); + + for (Field field : fields) { + try { + if (field.getType() == Integer.TYPE && field.getName().startsWith("TAG_")) { + if (field.get(null).equals(getIdentifier())) { + return StringUtil.lispToCamel(field.getName().substring(4).replace("_", "-").toLowerCase(), true); + } + } + } + catch (IllegalAccessException e) { + // Should never happen, but in case, abort + break; + } + } + } + */ } return null; 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 7201f785..574bfb4d 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 @@ -35,6 +35,7 @@ package com.twelvemonkeys.imageio.metadata.exif; * @author last modified by $Author: haraldk$ * @version $Id: TIFF.java,v 1.0 Nov 15, 2009 3:02:24 PM haraldk Exp$ */ +@SuppressWarnings("UnusedDeclaration") public interface TIFF { int TIFF_MAGIC = 42; @@ -98,6 +99,7 @@ public interface TIFF { int TAG_BITS_PER_SAMPLE = 258; int TAG_COMPRESSION = 259; int TAG_PHOTOMETRIC_INTERPRETATION = 262; + int TAG_FILL_ORDER = 266; int TAG_ORIENTATION = 274; int TAG_SAMPLES_PER_PIXEL = 277; int TAG_PLANAR_CONFIGURATION = 284; @@ -135,6 +137,7 @@ public interface TIFF { int TAG_IMAGE_DESCRIPTION = 270; int TAG_MAKE = 271; int TAG_MODEL = 272; + int TAG_PAGE_NUMBER = 297; int TAG_SOFTWARE = 305; int TAG_ARTIST = 315; int TAG_HOST_COMPUTER = 316; @@ -168,7 +171,7 @@ public interface TIFF { // "Old-style" JPEG (Obsolete) DO NOT WRITE! int TAG_OLD_JPEG_PROC = 512; - int TAG_OLD_JPEG_QTABLES = 519; - int TAG_OLD_JPEG_DCTABLES = 520; - int TAG_OLD_JPEG_ACTABLES = 521; + int TAG_OLD_JPEG_Q_TABLES = 519; + int TAG_OLD_JPEG_DC_TABLES = 520; + int TAG_OLD_JPEG_AC_TABLES = 521; }