Return-Path: X-Original-To: apmail-commons-commits-archive@minotaur.apache.org Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6062FDAF3 for ; Wed, 4 Jul 2012 04:21:34 +0000 (UTC) Received: (qmail 76575 invoked by uid 500); 4 Jul 2012 04:21:34 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 75812 invoked by uid 500); 4 Jul 2012 04:21:32 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 75784 invoked by uid 99); 4 Jul 2012 04:21:31 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Jul 2012 04:21:31 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,FRT_PROFIT2 X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Jul 2012 04:21:27 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 6FC8423888CD for ; Wed, 4 Jul 2012 04:21:07 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1357065 [1/2] - in /commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff: ./ constants/ Date: Wed, 04 Jul 2012 04:21:05 -0000 To: commits@commons.apache.org From: damjan@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120704042107.6FC8423888CD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: damjan Date: Wed Jul 4 04:21:03 2012 New Revision: 1357065 URL: http://svn.apache.org/viewvc?rev=1357065&view=rev Log: Make TIFF tag names a closer match to what is in the specs. Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/AdobePageMaker6TagConstants.java commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/AdobePhotoshopTagConstants.java commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/DcfTagConstants.java commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/DngTagConstants.java commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/ExifTagConstants.java commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/GdalLibraryTagConstants.java commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/GeoTiffTagConstants.java commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/GpsTagConstants.java commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/HylaFaxTagConstants.java commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/MicrosoftHdPhotoTagConstants.java commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/MicrosoftTagConstants.java commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/MolecularDynamicsGelTagConstants.java commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/OceScanjobTagConstants.java commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/Rfc2301TagConstants.java commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/Tiff4TagConstants.java commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/TiffEpTagConstants.java commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/TiffTagConstants.java commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/WangTagConstants.java Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java?rev=1357065&r1=1357064&r2=1357065&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java Wed Jul 4 04:21:03 2012 @@ -89,7 +89,7 @@ public class TiffImageParser extends Ima .readFirstDirectory(byteSource, params, false, formatCompliance); TiffDirectory directory = contents.directories.get(0); - return directory.getFieldValue(AllTagConstants.EXIF_TAG_ICC_PROFILE, + return directory.getFieldValue(AllTagConstants.EXIF_TAG_INTER_COLOR_PROFILE, false); } Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/AdobePageMaker6TagConstants.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/AdobePageMaker6TagConstants.java?rev=1357065&r1=1357064&r2=1357065&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/AdobePageMaker6TagConstants.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/AdobePageMaker6TagConstants.java Wed Jul 4 04:21:03 2012 @@ -35,19 +35,19 @@ import org.apache.commons.imaging.format */ public interface AdobePageMaker6TagConstants extends TiffFieldTypeConstants { public static final TagInfoLong TIFF_TAG_SUB_IFD = new TagInfoLong( - "Sub IFD", 0x014a, -1, + "SubIFDs", 0x014a, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN, true); public static final TagInfoByte TIFF_TAG_CLIP_PATH = new TagInfoByte( - "Clip Path", 0x0157, -1, + "ClipPath", 0x0157, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoLong TIFF_TAG_XCLIP_PATH_UNITS = new TagInfoLong( - "XClip Path Units", 0x0158, 1, + "XClipPathUnits", 0x0158, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoLong TIFF_TAG_YCLIP_PATH_UNITS = new TagInfoLong( - "YClip Path Units", 0x0159, 1, + "YClipPathUnits", 0x0159, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoShort TIFF_TAG_INDEXED = new TagInfoShort( @@ -63,7 +63,7 @@ public interface AdobePageMaker6TagConst public static final int OPIPROXY_VALUE_HIGHER_RESOLUTION_IMAGE_EXISTS = 1; public static final TagInfoAscii TIFF_TAG_IMAGE_ID = new TagInfoAscii( - "Image ID", 0x800d, -1, + "ImageID", 0x800d, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final List ALL_ADOBE_PAGEMAKER_6_TAGS = Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/AdobePhotoshopTagConstants.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/AdobePhotoshopTagConstants.java?rev=1357065&r1=1357064&r2=1357065&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/AdobePhotoshopTagConstants.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/AdobePhotoshopTagConstants.java Wed Jul 4 04:21:03 2012 @@ -36,7 +36,7 @@ public interface AdobePhotoshopTagConsta TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoUndefined EXIF_TAG_IMAGE_SOURCE_DATA = new TagInfoUndefined( - "Image Source Data", 0x935c, 1, + "ImageSourceData", 0x935c, 1, TiffDirectoryType.EXIF_DIRECTORY_IFD0); public static final List ALL_ADOBE_PHOTOSHOP_TAGS = Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/DcfTagConstants.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/DcfTagConstants.java?rev=1357065&r1=1357064&r2=1357065&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/DcfTagConstants.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/DcfTagConstants.java Wed Jul 4 04:21:03 2012 @@ -32,19 +32,19 @@ import org.apache.commons.imaging.format */ public interface DcfTagConstants extends TiffFieldTypeConstants { public static final TagInfoAscii EXIF_TAG_RELATED_IMAGE_FILE_FORMAT = new TagInfoAscii( - "Related Image File Format", 0x1000, -1, + "RelatedImageFileFormat", 0x1000, -1, TiffDirectoryType.EXIF_DIRECTORY_INTEROP_IFD); public static final TagInfoShortOrLong EXIF_TAG_RELATED_IMAGE_WIDTH = new TagInfoShortOrLong( - "Related Image Width", 0x1001, 1, + "RelatedImageWidth", 0x1001, 1, TiffDirectoryType.EXIF_DIRECTORY_INTEROP_IFD); public static final TagInfoShortOrLong EXIF_TAG_RELATED_IMAGE_LENGTH = new TagInfoShortOrLong( - "Related Image Length", 0x1002, 1, + "RelatedImageLength", 0x1002, 1, TiffDirectoryType.EXIF_DIRECTORY_INTEROP_IFD); public static final TagInfoShort EXIF_TAG_COLOR_SPACE = new TagInfoShort( - "Color Space", 0xa001, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); + "ColorSpace", 0xa001, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); public static final int COLOR_SPACE_VALUE_SRGB = 1; public static final int COLOR_SPACE_VALUE_ADOBE_RGB = 2; public static final int COLOR_SPACE_VALUE_UNCALIBRATED = 65535; Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/DngTagConstants.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/DngTagConstants.java?rev=1357065&r1=1357064&r2=1357065&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/DngTagConstants.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/DngTagConstants.java Wed Jul 4 04:21:03 2012 @@ -42,23 +42,23 @@ import org.apache.commons.imaging.format */ public interface DngTagConstants extends TiffFieldTypeConstants { public static final TagInfoByte EXIF_TAG_DNG_VERSION = new TagInfoByte( - "DNG Version", 0xc612, 4, + "DNGVersion", 0xc612, 4, TiffDirectoryType.EXIF_DIRECTORY_IFD0); public static final TagInfoByte EXIF_TAG_DNG_BACKWARD_VERSION = new TagInfoByte( - "DNG Backward Version", 0xc613, 4, + "DNGBackwardVersion", 0xc613, 4, TiffDirectoryType.EXIF_DIRECTORY_IFD0); public static final TagInfoAscii EXIF_TAG_UNIQUE_CAMERA_MODEL = new TagInfoAscii( - "Unique Camera Model", 0xc614, -1, + "UniqueCameraModel", 0xc614, -1, TiffDirectoryType.EXIF_DIRECTORY_IFD0); public static final TagInfoAsciiOrByte EXIF_TAG_LOCALIZED_CAMERA_MODEL = new TagInfoAsciiOrByte( - "Localized Camera Model", 0xc615, -1, + "LocalizedCameraModel", 0xc615, -1, TiffDirectoryType.EXIF_DIRECTORY_IFD0); public static final TagInfoByte EXIF_TAG_CFAPLANE_COLOR = new TagInfoByte( - "CFAPlane Color", 0xc616, -1, + "CFAPlaneColor", 0xc616, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoShort EXIF_TAG_CFALAYOUT = new TagInfoShort( @@ -75,129 +75,129 @@ public interface DngTagConstants extends public static final int CFALAYOUT_VALUE_EVEN_ROWS_OFFSET_DOWN_1_2_ROW_EVEN_COLUMNS_OFFSET_RIGHT_1_2_COLUMN = 9; public static final TagInfoShort EXIF_TAG_LINEARIZATION_TABLE = new TagInfoShort( - "Linearization Table", 0xc618, -1, + "LinearizationTable", 0xc618, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoShort EXIF_TAG_BLACK_LEVEL_REPEAT_DIM = new TagInfoShort( - "Black Level Repeat Dim", 0xc619, + "BlackLevelRepeatDim", 0xc619, 2, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoShortOrLongOrRational EXIF_TAG_BLACK_LEVEL = new TagInfoShortOrLongOrRational( - "Black Level", 0xc61a, -1, + "BlackLevel", 0xc61a, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoSRational EXIF_TAG_BLACK_LEVEL_DELTA_H = new TagInfoSRational( - "Black Level Delta H", 0xc61b, -1, + "BlackLevelDeltaH", 0xc61b, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoSRational EXIF_TAG_BLACK_LEVEL_DELTA_V = new TagInfoSRational( - "Black Level Delta V", 0xc61c, -1, + "BlackLevelDeltaV", 0xc61c, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoShortOrLong EXIF_TAG_WHITE_LEVEL = new TagInfoShortOrLong( - "White Level", 0xc61d, -1, + "WhiteLevel", 0xc61d, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoRational EXIF_TAG_DEFAULT_SCALE = new TagInfoRational( - "Default Scale", 0xc61e, 2, + "DefaultScale", 0xc61e, 2, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoShortOrLongOrRational EXIF_TAG_DEFAULT_CROP_ORIGIN = new TagInfoShortOrLongOrRational( - "Default Crop Origin", 0xc61f, 2, + "DefaultCropOrigin", 0xc61f, 2, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoShortOrLongOrRational EXIF_TAG_DEFAULT_CROP_SIZE = new TagInfoShortOrLongOrRational( - "Default Crop Size", 0xc620, 2, + "DefaultCropSize", 0xc620, 2, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoSRational EXIF_TAG_COLOR_MATRIX_1 = new TagInfoSRational( - "Color Matrix 1", 0xc621, -1, + "ColorMatrix1", 0xc621, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoSRational EXIF_TAG_COLOR_MATRIX_2 = new TagInfoSRational( - "Color Matrix 2", 0xc622, -1, + "ColorMatrix2", 0xc622, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoSRational EXIF_TAG_CAMERA_CALIBRATION_1 = new TagInfoSRational( - "Camera Calibration 1", 0xc623, -1, + "CameraCalibration1", 0xc623, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoSRational EXIF_TAG_CAMERA_CALIBRATION_2 = new TagInfoSRational( - "Camera Calibration 2", 0xc624, -1, + "CameraCalibration2", 0xc624, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoSRational EXIF_TAG_REDUCTION_MATRIX_1 = new TagInfoSRational( - "Reduction Matrix 1", 0xc625, -1, + "ReductionMatrix1", 0xc625, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoSRational EXIF_TAG_REDUCTION_MATRIX_2 = new TagInfoSRational( - "Reduction Matrix 2", 0xc626, -1, + "ReductionMatrix2", 0xc626, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoRational EXIF_TAG_ANALOG_BALANCE = new TagInfoRational( - "Analog Balance", 0xc627, -1, + "AnalogBalance", 0xc627, -1, TiffDirectoryType.EXIF_DIRECTORY_IFD0); public static final TagInfoShortOrRational EXIF_TAG_AS_SHOT_NEUTRAL = new TagInfoShortOrRational( - "As Shot Neutral", 0xc628, -1, + "AsShotNeutral", 0xc628, -1, TiffDirectoryType.EXIF_DIRECTORY_IFD0); public static final TagInfoRational EXIF_TAG_AS_SHOT_WHITE_XY = new TagInfoRational( - "As Shot White XY", 0xc629, 2, + "AsShotWhiteXY", 0xc629, 2, TiffDirectoryType.EXIF_DIRECTORY_IFD0); public static final TagInfoSRational EXIF_TAG_BASELINE_EXPOSURE = new TagInfoSRational( - "Baseline Exposure", 0xc62a, 1, + "BaselineExposure", 0xc62a, 1, TiffDirectoryType.EXIF_DIRECTORY_IFD0); public static final TagInfoRational EXIF_TAG_BASELINE_NOISE = new TagInfoRational( - "Baseline Noise", 0xc62b, 1, + "BaselineNoise", 0xc62b, 1, TiffDirectoryType.EXIF_DIRECTORY_IFD0); public static final TagInfoRational EXIF_TAG_BASELINE_SHARPNESS = new TagInfoRational( - "Baseline Sharpness", 0xc62c, 1, + "BaselineSharpness", 0xc62c, 1, TiffDirectoryType.EXIF_DIRECTORY_IFD0); public static final TagInfoLong EXIF_TAG_BAYER_GREEN_SPLIT = new TagInfoLong( - "Bayer Green Split", 0xc62d, 1, + "BayerGreenSplit", 0xc62d, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoRational EXIF_TAG_LINEAR_RESPONSE_LIMIT = new TagInfoRational( - "Linear Response Limit", 0xc62e, 1, + "LinearResponseLimit", 0xc62e, 1, TiffDirectoryType.EXIF_DIRECTORY_IFD0); public static final TagInfoAscii EXIF_TAG_CAMERA_SERIAL_NUMBER = new TagInfoAscii( - "Camera Serial Number", 0xc62f, -1, + "CameraSerialNumber", 0xc62f, -1, TiffDirectoryType.EXIF_DIRECTORY_IFD0); public static final TagInfoRational EXIF_TAG_DNG_LENS_INFO = new TagInfoRational( - "DNG Lens Info", 0xc630, 4, + "DNGLensInfo", 0xc630, 4, TiffDirectoryType.EXIF_DIRECTORY_IFD0); public static final TagInfoRational EXIF_TAG_CHROMA_BLUR_RADIUS = new TagInfoRational( - "Chroma Blur Radius", 0xc631, 1, + "ChromaBlurRadius", 0xc631, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoRational EXIF_TAG_ANTI_ALIAS_STRENGTH = new TagInfoRational( - "Anti Alias Strength", 0xc632, 1, + "AntiAliasStrength", 0xc632, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoRational EXIF_TAG_SHADOW_SCALE = new TagInfoRational( - "Shadow Scale", 0xc633, 1, + "ShadowScale", 0xc633, 1, TiffDirectoryType.EXIF_DIRECTORY_IFD0); public static final TagInfoByte EXIF_TAG_DNG_PRIVATE_DATA = new TagInfoByte( - "DNG Private Data", 0xc634, -1, + "DNGPrivateData", 0xc634, -1, TiffDirectoryType.EXIF_DIRECTORY_IFD0); public static final TagInfoShort EXIF_TAG_MAKER_NOTE_SAFETY = new TagInfoShort( - "Maker Note Safety", 0xc635, 1, + "MakerNoteSafety", 0xc635, 1, TiffDirectoryType.EXIF_DIRECTORY_IFD0); public static final int MAKER_NOTE_SAFETY_VALUE_UNSAFE = 0; public static final int MAKER_NOTE_SAFETY_VALUE_SAFE = 1; public static final TagInfoShort EXIF_TAG_CALIBRATION_ILLUMINANT_1 = new TagInfoShort( - "Calibration Illuminant 1", 0xc65a, 1, + "CalibrationIlluminant1", 0xc65a, 1, TiffDirectoryType.EXIF_DIRECTORY_IFD0); public static final int CALIBRATION_ILLUMINANT_1_VALUE_DAYLIGHT = 1; public static final int CALIBRATION_ILLUMINANT_1_VALUE_FLUORESCENT = 2; @@ -221,7 +221,7 @@ public interface DngTagConstants extends public static final int CALIBRATION_ILLUMINANT_1_VALUE_OTHER = 255; public static final TagInfoShort EXIF_TAG_CALIBRATION_ILLUMINANT_2 = new TagInfoShort( - "Calibration Illuminant 2", 0xc65b, 1, + "CalibrationIlluminant2", 0xc65b, 1, TiffDirectoryType.EXIF_DIRECTORY_IFD0); public static final int CALIBRATION_ILLUMINANT_2_VALUE_DAYLIGHT = 1; public static final int CALIBRATION_ILLUMINANT_2_VALUE_FLUORESCENT = 2; @@ -245,93 +245,93 @@ public interface DngTagConstants extends public static final int CALIBRATION_ILLUMINANT_2_VALUE_OTHER = 255; public static final TagInfoRational EXIF_TAG_BEST_QUALITY_SCALE = new TagInfoRational( - "Best Quality Scale", 0xc65c, 1, + "BestQualityScale", 0xc65c, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoByte EXIF_TAG_RAW_DATA_UNIQUE_ID = new TagInfoByte( - "Raw Data Unique ID", 0xc65d, 16, + "RawDataUniqueID", 0xc65d, 16, TiffDirectoryType.EXIF_DIRECTORY_IFD0); public static final TagInfoAsciiOrByte EXIF_TAG_ORIGINAL_RAW_FILE_NAME = new TagInfoAsciiOrByte( - "Original Raw File Name", 0xc68b, -1, + "OriginalRawFileName", 0xc68b, -1, TiffDirectoryType.EXIF_DIRECTORY_IFD0); public static final TagInfoUndefined EXIF_TAG_ORIGINAL_RAW_FILE_DATA = new TagInfoUndefined( - "Original Raw File Data", 0xc68c, -1, + "OriginalRawFileData", 0xc68c, -1, TiffDirectoryType.EXIF_DIRECTORY_IFD0); public static final TagInfoShortOrLong EXIF_TAG_ACTIVE_AREA = new TagInfoShortOrLong( - "Active Area", 0xc68d, 4, + "ActiveArea", 0xc68d, 4, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoShortOrLong EXIF_TAG_MASKED_AREAS = new TagInfoShortOrLong( - "Masked Areas", 0xc68e, 4, + "MaskedAreas", 0xc68e, 4, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoUndefined EXIF_TAG_AS_SHOT_ICCPROFILE = new TagInfoUndefined( - "As Shot ICCProfile", 0xc68f, -1, + "AsShotICCProfile", 0xc68f, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoSRational EXIF_TAG_AS_SHOT_PRE_PROFILE_MATRIX = new TagInfoSRational( - "As Shot Pre Profile Matrix", 0xc690, -1, + "AsShotPreProfileMatrix", 0xc690, -1, TiffDirectoryType.EXIF_DIRECTORY_IFD0); public static final TagInfoUndefined EXIF_TAG_CURRENT_ICCPROFILE = new TagInfoUndefined( - "Current ICCProfile", 0xc691, -1, + "CurrentICCProfile", 0xc691, -1, TiffDirectoryType.EXIF_DIRECTORY_IFD0); public static final TagInfoSRational EXIF_TAG_CURRENT_PRE_PROFILE_MATRIX = new TagInfoSRational( - "Current Pre Profile Matrix", 0xc692, -1, + "CurrentPreProfileMatrix", 0xc692, -1, TiffDirectoryType.EXIF_DIRECTORY_IFD0); public static final TagInfoShort EXIF_TAG_COLORIMETRIC_REFERENCE = new TagInfoShort( - "Colorimetric Reference", 0xc6bf, 1, + "ColorimetricReference", 0xc6bf, 1, TiffDirectoryType.EXIF_DIRECTORY_IFD0); public static final short COLORIMETRIC_REFERENCE_VALUE_SCENE_REFERRED = 0; public static final short COLORIMETRIC_REFERENCE_VALUE_OUTPUT_REFERRED = 1; public static final TagInfoAsciiOrByte EXIF_TAG_CAMERA_CALIBRATION_SIGNATURE = new TagInfoAsciiOrByte( - "Camera Calibration Signature", 0xc6f3, -1, + "CameraCalibrationSignature", 0xc6f3, -1, TiffDirectoryType.EXIF_DIRECTORY_IFD0); public static final TagInfoAsciiOrByte EXIF_TAG_PROFILE_CALIBRATION_SIGNATURE = new TagInfoAsciiOrByte( - "Profile Calibration Signature", 0xc6f4, -1, + "ProfileCalibrationSignature", 0xc6f4, -1, TiffDirectoryType.EXIF_DIRECTORY_IFD0); public static final TagInfoLong EXIF_TAG_EXTRA_CAMERA_PROFILES = new TagInfoLong( - "Extra Camera Profiles", 0xc6f5, -1, + "ExtraCameraProfiles", 0xc6f5, -1, TiffDirectoryType.EXIF_DIRECTORY_IFD0); public static final TagInfoAsciiOrByte EXIF_TAG_AS_SHOT_PROFILE_NAME = new TagInfoAsciiOrByte( - "As Shot Profile Name", 0xc6f6, -1, + "AsShotProfileName", 0xc6f6, -1, TiffDirectoryType.EXIF_DIRECTORY_IFD0); public static final TagInfoRational EXIF_TAG_NOISE_REDUCTION_APPLIED = new TagInfoRational( - "Noise Reduction Applied", 0xc6f7, 1, + "NoiseReductionApplied", 0xc6f7, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoAscii EXIF_TAG_PROFILE_NAME = new TagInfoAscii( - "Profile Name", 0xc6f8, -1, + "ProfileName", 0xc6f8, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoLong EXIF_TAG_PROFILE_HUE_SAT_MAP_DIMS = new TagInfoLong( - "Profile Hue/Sat/Map", 0xc6f9, 3, + "ProfileHueSatMapDims", 0xc6f9, 3, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoFloat EXIF_TAG_PROFILE_HUE_SAT_MAP_DATA1 = new TagInfoFloat( - "Profile Hue/Sat/Map Data1", 0xc6fa, -1, + "ProfileHueSatMapData1", 0xc6fa, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoFloat EXIF_TAG_PROFILE_HUE_SAT_MAP_DATA2 = new TagInfoFloat( - "Profile Hue/Sat/Map Data2", 0xc6fb, -1, + "ProfileHueSatMapData2", 0xc6fb, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoFloat EXIF_TAG_PROFILE_TONE_CURVE = new TagInfoFloat( - "Profile Tone Curve", 0xc6fc, -1, + "ProfileToneCurve", 0xc6fc, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoLong EXIF_TAG_PROFILE_EMBED_POLICY = new TagInfoLong( - "Profile Embed Policy", 0xc6fd, 1, + "ProfileEmbedPolicy", 0xc6fd, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final int PROFILE_EMBED_POLICY_VALUE_ALLOW_COPYING = 0; public static final int PROFILE_EMBED_POLICY_VALUE_EMBED_IF_USED = 1; @@ -339,35 +339,35 @@ public interface DngTagConstants extends public static final int PROFILE_EMBED_POLICY_VALUE_NO_RESTRICTIONS = 3; public static final TagInfoAsciiOrByte EXIF_TAG_PROFILE_COPYRIGHT = new TagInfoAsciiOrByte( - "Profile Copyright", 0xc6fe, -1, + "ProfileCopyright", 0xc6fe, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoSRational EXIF_TAG_FORWARD_MATRIX1 = new TagInfoSRational( - "Forward Matrix 1", 0xc714, -1, + "ForwardMatrix1", 0xc714, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoSRational EXIF_TAG_FORWARD_MATRIX2 = new TagInfoSRational( - "Forward Matrix 2", 0xc715, -1, + "ForwardMatrix2", 0xc715, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoAsciiOrByte EXIF_TAG_PREVIEW_APPLICATION_NAME = new TagInfoAsciiOrByte( - "Preview Application Name", 0xc716, -1, + "PreviewApplicationName", 0xc716, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoAsciiOrByte EXIF_TAG_PREVIEW_APPLICATION_VERSION = new TagInfoAsciiOrByte( - "Preview Application Version", 0xc717, -1, + "PreviewApplicationVersion", 0xc717, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoAsciiOrByte EXIF_TAG_PREVIEW_SETTINGS_NAME = new TagInfoAsciiOrByte( - "Preview Settings Name", 0xc718, -1, + "PreviewSettingsName", 0xc718, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoByte EXIF_TAG_PREVIEW_SETTINGS_DIGEST = new TagInfoByte( - "Preview Settings Digest", 0xc719, 16, + "PreviewSettingsDigest", 0xc719, 16, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoLong EXIF_TAG_PREVIEW_COLORSPACE = new TagInfoLong( - "Preview Colorspace", 0xc71a, 1, + "PreviewColorspace", 0xc71a, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final int PREVIEW_COLORSPACE_VALUE_UNKNOWN = 0; public static final int PREVIEW_COLORSPACE_VALUE_GRAY_GAMMA_2_2 = 1; @@ -376,47 +376,47 @@ public interface DngTagConstants extends public static final int PREVIEW_COLORSPACE_VALUE_PROPHOTO_RGB = 4; public static final TagInfoAscii EXIF_TAG_PREVIEW_DATE_TIME = new TagInfoAscii( - "Preview DateTime", 0xc71b, -1, + "PreviewDateTime", 0xc71b, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoByte EXIF_TAG_RAW_IMAGE_DIGEST = new TagInfoByte( - "Raw Image Digest", 0xc71c, 16, + "RawImageDigest", 0xc71c, 16, TiffDirectoryType.EXIF_DIRECTORY_IFD0); public static final TagInfoByte EXIF_TAG_ORIGINAL_RAW_FILE_DIGEST = new TagInfoByte( - "Original Raw File Digest", 0xc71d, 16, + "OriginalRawFileDigest", 0xc71d, 16, TiffDirectoryType.EXIF_DIRECTORY_IFD0); public static final TagInfoShortOrLong EXIF_TAG_SUB_TILE_BLOCK_SIZE = new TagInfoShortOrLong( - "Sub Tile Block Size", 0xc71e, 2, + "SubTileBlockSize", 0xc71e, 2, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoShortOrLong EXIF_TAG_ROW_INTERLEAVE_FACTOR = new TagInfoShortOrLong( - "Row Interleave Factor", 0xc71f, 1, + "RowInterleaveFactor", 0xc71f, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoLong EXIF_TAG_PROFILE_LOOK_TABLE_DIMS = new TagInfoLong( - "Profile Look Table Dims", 0xc725, 3, + "ProfileLookTableDims", 0xc725, 3, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoFloat EXIF_TAG_PROFILE_LOOK_TABLE_DATA = new TagInfoFloat( - "Profile Look Table Data", 0xc726, -1, + "ProfileLookTableData", 0xc726, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoUndefined EXIF_TAG_OPCODE_LIST_1 = new TagInfoUndefined( - "Opcode List 1", 0xc740, -1, + "OpcodeList1", 0xc740, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoUndefined EXIF_TAG_OPCODE_LIST_2 = new TagInfoUndefined( - "Opcode List 2", 0xc741, -1, + "OpcodeList2", 0xc741, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoUndefined EXIF_TAG_OPCODE_LIST_3 = new TagInfoUndefined( - "Opcode List 3", 0xc74E, -1, + "OpcodeList3", 0xc74E, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoDouble EXIF_TAG_NOISE_PROFILE = new TagInfoDouble( - "Noise Profile", 0xc761, -1, + "NoiseProfile", 0xc761, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final List ALL_DNG_TAGS = Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/ExifTagConstants.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/ExifTagConstants.java?rev=1357065&r1=1357064&r2=1357065&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/ExifTagConstants.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/ExifTagConstants.java Wed Jul 4 04:21:03 2012 @@ -40,153 +40,162 @@ import org.apache.commons.imaging.format * http://tiki-lounge.com/~raf/tiff/fields.html * http://www.awaresystems.be/imaging/tiff/tifftags.html * - * DNG: http://wwwimages.adobe.com/www.adobe.com/content/dam/Adobe/en/products/photoshop/pdfs/dng_spec.pdf - * * "Stonits": http://www.anyhere.com/gward/pixformat/tiffluv.html */ public interface ExifTagConstants extends TiffFieldTypeConstants { - public static final TagInfoAscii EXIF_TAG_INTEROP_INDEX = new TagInfoAscii( - "Interop Index", 0x0001, 1, + public static final TagInfoAscii EXIF_TAG_INTEROPERABILITY_INDEX = new TagInfoAscii( + "InteroperabilityIndex", 0x0001, 1, TiffDirectoryType.EXIF_DIRECTORY_INTEROP_IFD); - public static final TagInfoUndefined EXIF_TAG_INTEROP_VERSION = new TagInfoUndefined( - "Interop Version", 0x0002, 1, + public static final TagInfoUndefined EXIF_TAG_INTEROPERABILITY_VERSION = new TagInfoUndefined( + "InteroperabilityVersion", 0x0002, 1, TiffDirectoryType.EXIF_DIRECTORY_INTEROP_IFD); public static final TagInfoAscii EXIF_TAG_PROCESSING_SOFTWARE = new TagInfoAscii( - "Processing Software", 0x000b, 1, + "ProcessingSoftware", 0x000b, 1, TiffDirectoryType.EXIF_DIRECTORY_IFD0); public static final TagInfoAscii EXIF_TAG_SOFTWARE = new TagInfoAscii( "Software", 0x0131, 1, TiffDirectoryType.EXIF_DIRECTORY_IFD0); public static final TagInfoLong EXIF_TAG_PREVIEW_IMAGE_START_IFD0 = new TagInfoLong( - "Preview Image Start", 0x0111, 1, + "PreviewImageStart", 0x0111, 1, TiffDirectoryType.EXIF_DIRECTORY_IFD0, true); public static final TagInfoLong EXIF_TAG_PREVIEW_IMAGE_START_SUB_IFD1 = new TagInfoLong( - "Preview Image Start", 0x0111, 1, + "PreviewImageStart", 0x0111, 1, TiffDirectoryType.EXIF_DIRECTORY_SUB_IFD1, true); public static final TagInfoLong EXIF_TAG_JPG_FROM_RAW_START_SUB_IFD2 = new TagInfoLong( - "Jpg From Raw Start", 0x0111, 1, + "JpgFromRawStart", 0x0111, 1, TiffDirectoryType.EXIF_DIRECTORY_SUB_IFD2, true); public static final TagInfoLong EXIF_TAG_PREVIEW_IMAGE_LENGTH_IFD0 = new TagInfoLong( - "Preview Image Length", 0x0117, 1, + "PreviewImageLength", 0x0117, 1, TiffDirectoryType.EXIF_DIRECTORY_IFD0); public static final TagInfoLong EXIF_TAG_PREVIEW_IMAGE_LENGTH_SUB_IFD1 = new TagInfoLong( - "Preview Image Length", 0x0117, 1, + "PreviewImageLength", 0x0117, 1, TiffDirectoryType.EXIF_DIRECTORY_SUB_IFD1); public static final TagInfoLong EXIF_TAG_JPG_FROM_RAW_LENGTH_SUB_IFD2 = new TagInfoLong( - "Jpg From Raw Length", 0x0117, 1, + "JpgFromRawLength", 0x0117, 1, TiffDirectoryType.EXIF_DIRECTORY_SUB_IFD2); public static final TagInfoLong EXIF_TAG_PREVIEW_IMAGE_START_MAKER_NOTES = new TagInfoLong( - "Preview Image Start", 0x0201, 1, + "PreviewImageStart", 0x0201, 1, TiffDirectoryType.EXIF_DIRECTORY_MAKER_NOTES); public static final TagInfoLong EXIF_TAG_JPG_FROM_RAW_START_SUB_IFD = new TagInfoLong( - "Jpg From Raw Start", 0x0201, 1, + "JpgFromRawStart", 0x0201, 1, TiffDirectoryType.EXIF_DIRECTORY_SUB_IFD, true); public static final TagInfoLong EXIF_TAG_JPG_FROM_RAW_START_IFD2 = new TagInfoLong( - "Jpg From Raw Start", 0x0201, 1, + "JpgFromRawStart", 0x0201, 1, TiffDirectoryType.EXIF_DIRECTORY_IFD2, true); public static final TagInfoLong EXIF_TAG_OTHER_IMAGE_START = new TagInfoLong( - "Other Image Start", 0x0201, 1, + "OtherImageStart", 0x0201, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN, true); public static final TagInfoLong EXIF_TAG_PREVIEW_IMAGE_LENGTH_MAKER_NOTES = new TagInfoLong( - "Preview Image Length", 0x0202, 1, + "PreviewImageLength", 0x0202, 1, TiffDirectoryType.EXIF_DIRECTORY_MAKER_NOTES); public static final TagInfoLong EXIF_TAG_JPG_FROM_RAW_LENGTH_SUB_IFD = new TagInfoLong( - "Jpg From Raw Length", 0x0202, 1, + "JpgFromRawLength", 0x0202, 1, TiffDirectoryType.EXIF_DIRECTORY_SUB_IFD); public static final TagInfoLong EXIF_TAG_JPG_FROM_RAW_LENGTH_IFD2 = new TagInfoLong( - "Jpg From Raw Length", 0x0202, 1, + "JpgFromRawLength", 0x0202, 1, TiffDirectoryType.EXIF_DIRECTORY_IFD2); public static final TagInfoLong EXIF_TAG_OTHER_IMAGE_LENGTH = new TagInfoLong( - "Other Image Length", 0x0202, 1, + "OtherImageLength", 0x0202, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoByte EXIF_TAG_APPLICATION_NOTES = new TagInfoByte( - "Application Notes", 0x02bc, -1, + "ApplicationNotes", 0x02bc, -1, + TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); + public static final TagInfoUnknown EXIF_TAG_MATTEING = new TagInfoUnknown( + "Matteing", 0x80e3, -1, + TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); + public static final TagInfoUnknown EXIF_TAG_DATA_TYPE = new TagInfoUnknown( + "DataType", 0x80e4, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - public static final TagInfoUnknown EXIF_TAG_MATTEING = new TagInfoUnknown("Matteing", - 0x80e3, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - public static final TagInfoUnknown EXIF_TAG_DATA_TYPE = new TagInfoUnknown("Data Type", - 0x80e4, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoUnknown EXIF_TAG_IMAGE_DEPTH = new TagInfoUnknown( - "Image Depth", 0x80e5, -1, + "ImageDepth", 0x80e5, -1, + TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); + public static final TagInfoUnknown EXIF_TAG_TILE_DEPTH = new TagInfoUnknown( + "TileDepth", 0x80e6, -1, + TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); + public static final TagInfoUnknown EXIF_TAG_MODEL_2 = new TagInfoUnknown( + "Model2", 0x827d, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - public static final TagInfoUnknown EXIF_TAG_TILE_DEPTH = new TagInfoUnknown("Tile Depth", - 0x80e6, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - public static final TagInfoUnknown EXIF_TAG_MODEL_2 = new TagInfoUnknown("Model 2", - 0x827d, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoRational EXIF_TAG_EXPOSURE_TIME = new TagInfoRational( - "Exposure Time", 0x829a, -1, + "ExposureTime", 0x829a, -1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); public static final TagInfoRational EXIF_TAG_FNUMBER = new TagInfoRational( "FNumber", 0x829d, -1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); // FIXME: other types? - public static final TagInfoLong EXIF_TAG_IPTC_NAA = new TagInfoLong("IPTC-NAA", - 0x83bb, 1, TiffDirectoryType.EXIF_DIRECTORY_IFD0); + public static final TagInfoLong EXIF_TAG_IPTC_NAA = new TagInfoLong( + "IPTC-NAA", 0x83bb, 1, + TiffDirectoryType.EXIF_DIRECTORY_IFD0); public static final TagInfoShort EXIF_TAG_INTERGRAPH_PACKET_DATA = new TagInfoShort( - "Intergraph Packet Data", 0x847e, - -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); + "IntergraphPacketData", 0x847e, -1, + TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoLong EXIF_TAG_INTERGRAPH_FLAG_REGISTERS = new TagInfoLong( - "Intergraph Flag Registers", 0x847f, - 16, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - public static final TagInfoAscii EXIF_TAG_SITE = new TagInfoAscii("Site", 0x84e0, - -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); + "IntergraphFlagRegisters", 0x847f, 16, + TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); + public static final TagInfoAscii EXIF_TAG_SITE = new TagInfoAscii( + "Site", 0x84e0, -1, + TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoAscii EXIF_TAG_COLOR_SEQUENCE = new TagInfoAscii( - "Color Sequence", 0x84e1, -1, + "ColorSequence", 0x84e1, -1, + TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); + public static final TagInfoAscii EXIF_TAG_IT8HEADER = new TagInfoAscii( + "IT8Header", 0x84e2, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - public static final TagInfoAscii EXIF_TAG_IT8HEADER = new TagInfoAscii("IT8 Header", - 0x84e2, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoShort EXIF_TAG_RASTER_PADDING = new TagInfoShort( - "Raster Padding", 0x84e3, 1, + "RasterPadding", 0x84e3, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoShort EXIF_TAG_BITS_PER_RUN_LENGTH = new TagInfoShort( - "Bits Per Run Length", 0x84e4, 1, + "BitsPerRunLength", 0x84e4, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoShort EXIF_TAG_BITS_PER_EXTENDED_RUN_LENGTH = new TagInfoShort( - "Bits Per Extended Run Length", 0x84e5, - 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); + "BitsPerExtendedRunLength", 0x84e5, 1, + TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoByte EXIF_TAG_COLOR_TABLE = new TagInfoByte( - "Color Table", 0x84e6, -1, + "ColorTable", 0x84e6, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoByte EXIF_TAG_IMAGE_COLOR_INDICATOR = new TagInfoByte( - "Image Color Indicator", 0x84e7, 1, + "ImageColorIndicator", 0x84e7, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoByte EXIF_TAG_BACKGROUND_COLOR_INDICATOR = new TagInfoByte( - "Background Color Indicator", 0x84e8, - 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); + "BackgroundColorIndicator", 0x84e8, 1, + TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoByte EXIF_TAG_IMAGE_COLOR_VALUE = new TagInfoByte( - "Image Color Value", 0x84e9, -1, + "ImageColorValue", 0x84e9, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoByte EXIF_TAG_BACKGROUND_COLOR_VALUE = new TagInfoByte( - "Background Color Value", 0x84ea, - -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); + "BackgroundColorValue", 0x84ea, -1, + TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoByte EXIF_TAG_PIXEL_INTENSITY_RANGE = new TagInfoByte( - "Pixel Intensity Range", 0x84eb, -1, + "PixelIntensityRange", 0x84eb, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoByte EXIF_TAG_TRANSPARENCY_INDICATOR = new TagInfoByte( - "Transparency Indicator", 0x84ec, - 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); + "TransparencyIndicator", 0x84ec, 1, + TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoAscii EXIF_TAG_COLOR_CHARACTERIZATION = new TagInfoAscii( - "Color Characterization", 0x84ed, -1, + "ColorCharacterization", 0x84ed, -1, + TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); + public static final TagInfoShortOrLong EXIF_TAG_HCUSAGE = new TagInfoShortOrLong( + "HCUsage", 0x84ee, 1, + TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); + public static final TagInfoAscii EXIF_TAG_SEMINFO = new TagInfoAscii( + "SEMInfo", 0x8546, 1, + TiffDirectoryType.EXIF_DIRECTORY_IFD0); + public static final TagInfoLong EXIF_TAG_AFCP_IPTC = new TagInfoLong( + "AFCP_IPTC", 0x8568, 1, + TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); + public static final TagInfoLong EXIF_TAG_LEAF_DATA = new TagInfoLong( + "LeafData", 0x8606, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - public static final TagInfoShortOrLong EXIF_TAG_HCUSAGE = new TagInfoShortOrLong("HCUsage", - 0x84ee, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - public static final TagInfoAscii EXIF_TAG_SEMINFO = new TagInfoAscii("SEMInfo", - 0x8546, 1, TiffDirectoryType.EXIF_DIRECTORY_IFD0); - public static final TagInfoLong EXIF_TAG_AFCP_IPTC = new TagInfoLong("AFCP_IPTC", - 0x8568, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - public static final TagInfoLong EXIF_TAG_LEAF_DATA = new TagInfoLong("Leaf Data", - 0x8606, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoByte EXIF_TAG_PHOTOSHOP_SETTINGS = new TagInfoByte( - "Photoshop Settings", 0x8649, -1, + "PhotoshopSettings", 0x8649, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoLong EXIF_TAG_EXIF_OFFSET = new TagInfoLong( - "Exif Offset", 0x8769, 1, + "ExifOffset", 0x8769, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN, true); public static final TagInfoShort EXIF_TAG_EXPOSURE_PROGRAM = new TagInfoShort( - "Exposure Program", 0x8822, 1, + "ExposureProgram", 0x8822, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); public static final int EXPOSURE_PROGRAM_VALUE_MANUAL = 1; public static final int EXPOSURE_PROGRAM_VALUE_PROGRAM_AE = 2; @@ -197,7 +206,7 @@ public interface ExifTagConstants public static final int EXPOSURE_PROGRAM_VALUE_PORTRAIT = 7; public static final int EXPOSURE_PROGRAM_VALUE_LANDSCAPE = 8; public static final TagInfoAscii EXIF_TAG_SPECTRAL_SENSITIVITY = new TagInfoAscii( - "Spectral Sensitivity", 0x8824, -1, + "SpectralSensitivity", 0x8824, -1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); public static final TagInfoLong EXIF_TAG_GPSINFO = new TagInfoLong( "GPSInfo", 0x8825, 1, @@ -209,42 +218,42 @@ public interface ExifTagConstants "Opto - Electric Conv Factor", 0x8828, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoLong EXIF_TAG_LEAF_SUB_IFD = new TagInfoLong( - "Leaf Sub IFD", 0x888a, 1, + "LeafSubIFD", 0x888a, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoUndefined EXIF_TAG_EXIF_VERSION = new TagInfoUndefined( - "Exif Version", 0x9000, 1, + "ExifVersion", 0x9000, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); public static final TagInfoAscii EXIF_TAG_DATE_TIME_ORIGINAL = new TagInfoAscii( - "Date Time Original", 0x9003, 1, + "DateTimeOriginal", 0x9003, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); public static final TagInfoAscii EXIF_TAG_CREATE_DATE = new TagInfoAscii( - "Create Date", 0x9004, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); + "CreateDate", 0x9004, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); public static final TagInfoUndefined EXIF_TAG_COMPONENTS_CONFIGURATION = new TagInfoUndefined( - "Components Configuration", 0x9101, 1, + "ComponentsConfiguration", 0x9101, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); public static final TagInfoRational EXIF_TAG_COMPRESSED_BITS_PER_PIXEL = new TagInfoRational( - "Compressed Bits Per Pixel", 0x9102, 1, + "CompressedBitsPerPixel", 0x9102, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); public static final TagInfoSRational EXIF_TAG_SHUTTER_SPEED_VALUE = new TagInfoSRational( - "Shutter Speed Value", 0x9201, 1, + "ShutterSpeedValue", 0x9201, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); public static final TagInfoRational EXIF_TAG_APERTURE_VALUE = new TagInfoRational( - "Aperture Value", 0x9202, 1, + "ApertureValue", 0x9202, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); public static final TagInfoSRational EXIF_TAG_BRIGHTNESS_VALUE = new TagInfoSRational( - "Brightness Value", 0x9203, 1, + "BrightnessValue", 0x9203, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); public static final TagInfoSRational EXIF_TAG_EXPOSURE_COMPENSATION = new TagInfoSRational( - "Exposure Compensation", 0x9204, 1, + "ExposureCompensation", 0x9204, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); public static final TagInfoRational EXIF_TAG_MAX_APERTURE_VALUE = new TagInfoRational( - "Max Aperture Value", 0x9205, 1, + "MaxApertureValue", 0x9205, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); public static final TagInfoRational EXIF_TAG_SUBJECT_DISTANCE = new TagInfoRational( "Subject Distance", 0x9206, -1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); public static final TagInfoShort EXIF_TAG_METERING_MODE = new TagInfoShort( - "Metering Mode", 0x9207, 1, + "MeteringMode", 0x9207, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); public static final int METERING_MODE_VALUE_AVERAGE = 1; public static final int METERING_MODE_VALUE_CENTER_WEIGHTED_AVERAGE = 2; @@ -254,7 +263,7 @@ public interface ExifTagConstants public static final int METERING_MODE_VALUE_PARTIAL = 6; public static final int METERING_MODE_VALUE_OTHER = 255; public static final TagInfoShort EXIF_TAG_LIGHT_SOURCE = new TagInfoShort( - "Light Source", 0x9208, 1, + "LightSource", 0x9208, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); public static final int LIGHT_SOURCE_VALUE_DAYLIGHT = 1; public static final int LIGHT_SOURCE_VALUE_FLUORESCENT = 2; @@ -307,59 +316,61 @@ public interface ExifTagConstants public static final int FLASH_VALUE_AUTO_FIRED_RED_EYE_REDUCTION_RETURN_NOT_DETECTED = 0x5d; public static final int FLASH_VALUE_AUTO_FIRED_RED_EYE_REDUCTION_RETURN_DETECTED = 0x5f; public static final TagInfoRational EXIF_TAG_FOCAL_LENGTH = new TagInfoRational( - "Focal Length", 0x920a, -1, + "FocalLength", 0x920a, -1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); public static final TagInfoShort EXIF_TAG_SUBJECT_LOCATION_1 = new TagInfoShort( - "Subject Location", 0x9214, -1, + "SubjectLocation", 0x9214, -1, + TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); + public static final TagInfoDouble EXIF_TAG_STO_NITS = new TagInfoDouble( + "StoNits", 0x923f, 1, + TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); + public static final TagInfoUndefined EXIF_TAG_MAKER_NOTE = new TagInfoUndefined( + "MakerNote", 0x927c, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - public static final TagInfoDouble EXIF_TAG_STO_NITS = new TagInfoDouble("Sto Nits", - 0x923f, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - // skipping Maker Note! - public static final TagInfoUndefined EXIF_TAG_MAKER_NOTE = new TagInfoUndefined("Maker Note", - 0x927c, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); public static final TagInfoGpsText EXIF_TAG_USER_COMMENT = new TagInfoGpsText( "UserComment", 0x9286, FIELD_TYPE_UNDEFINED, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); public static final TagInfoAscii EXIF_TAG_SUB_SEC_TIME = new TagInfoAscii( - "Sub Sec Time", 0x9290, 1, + "SubSecTime", 0x9290, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); public static final TagInfoAscii EXIF_TAG_SUB_SEC_TIME_ORIGINAL = new TagInfoAscii( - "Sub Sec Time Original", 0x9291, 1, + "SubSecTimeOriginal", 0x9291, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); public static final TagInfoAscii EXIF_TAG_SUB_SEC_TIME_DIGITIZED = new TagInfoAscii( - "Sub Sec Time Digitized", 0x9292, 1, + "SubSecTimeDigitized", 0x9292, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); public static final TagInfoUndefined EXIF_TAG_FLASHPIX_VERSION = new TagInfoUndefined( - "Flashpix Version", 0xa000, 1, + "FlashpixVersion", 0xa000, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); public static final TagInfoShort EXIF_TAG_EXIF_IMAGE_WIDTH = new TagInfoShort( - "Exif Image Width", 0xa002, 1, + "ExifImageWidth", 0xa002, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); public static final TagInfoShort EXIF_TAG_EXIF_IMAGE_LENGTH = new TagInfoShort( - "Exif Image Length", 0xa003, 1, + "ExifImageLength", 0xa003, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); public static final TagInfoAscii EXIF_TAG_RELATED_SOUND_FILE = new TagInfoAscii( - "Related Sound File", 0xa004, 1, + "RelatedSoundFile", 0xa004, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); public static final TagInfoLong EXIF_TAG_INTEROP_OFFSET = new TagInfoLong( - "Interop Offset", 0xa005, 1, + "InteropOffset", 0xa005, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN, true); public static final TagInfoRational EXIF_TAG_FLASH_ENERGY_EXIF_IFD = new TagInfoRational( - "Flash Energy", 0xa20b, -1, + "FlashEnergy", 0xa20b, -1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); public static final TagInfoUndefined EXIF_TAG_SPATIAL_FREQUENCY_RESPONSE_2 = new TagInfoUndefined( - "Spatial Frequency Response", 0xa20c, - -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - public static final TagInfoUnknown EXIF_TAG_NOISE_2 = new TagInfoUnknown("Noise", 0xa20d, - -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); + "SpatialFrequencyResponse", 0xa20c, -1, + TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); + public static final TagInfoUnknown EXIF_TAG_NOISE_2 = new TagInfoUnknown( + "Noise", 0xa20d, -1, + TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoRational EXIF_TAG_FOCAL_PLANE_XRESOLUTION_EXIF_IFD = new TagInfoRational( - "Focal Plane XResolution", 0xa20e, 1, + "FocalPlaneXResolution", 0xa20e, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); public static final TagInfoRational EXIF_TAG_FOCAL_PLANE_YRESOLUTION_EXIF_IFD = new TagInfoRational( - "Focal Plane YResolution", 0xa20f, 1, + "FocalPlaneYResolution", 0xa20f, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); public static final TagInfoShort EXIF_TAG_FOCAL_PLANE_RESOLUTION_UNIT_EXIF_IFD = new TagInfoShort( - "Focal Plane Resolution Unit", 0xa210, 1, + "FocalPlaneResolutionUnit", 0xa210, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); public static final int FOCAL_PLANE_RESOLUTION_UNIT_EXIF_IFD_VALUE_NONE = 1; public static final int FOCAL_PLANE_RESOLUTION_UNIT_EXIF_IFD_VALUE_INCHES = 2; @@ -367,25 +378,25 @@ public interface ExifTagConstants public static final int FOCAL_PLANE_RESOLUTION_UNIT_EXIF_IFD_VALUE_MM = 4; public static final int FOCAL_PLANE_RESOLUTION_UNIT_EXIF_IFD_VALUE_UM = 5; public static final TagInfoUnknown EXIF_TAG_IMAGE_NUMBER = new TagInfoUnknown( - "Image Number", 0xa211, -1, + "ImageNumber", 0xa211, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoUnknown EXIF_TAG_SECURITY_CLASSIFICATION = new TagInfoUnknown( - "Security Classification", 0xa212, - -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); + "SecurityClassification", 0xa212, -1, + TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoUnknown EXIF_TAG_IMAGE_HISTORY = new TagInfoUnknown( - "Image History", 0xa213, -1, + "ImageHistory", 0xa213, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoShort EXIF_TAG_SUBJECT_LOCATION_2 = new TagInfoShort( - "Subject Location", 0xa214, 2, + "SubjectLocation", 0xa214, 2, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); public static final TagInfoRational EXIF_TAG_EXPOSURE_INDEX_EXIF_IFD = new TagInfoRational( - "Exposure Index", 0xa215, 1, + "ExposureIndex", 0xa215, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); public static final TagInfoUnknown EXIF_TAG_TIFF_EPSTANDARD_ID_2 = new TagInfoUnknown( - "TIFF-EPStandard ID", 0xa216, -1, + "TIFF-EPStandardID", 0xa216, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoShort EXIF_TAG_SENSING_METHOD_EXIF_IFD = new TagInfoShort( - "Sensing Method", 0xa217, 1, + "SensingMethod", 0xa217, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); public static final int SENSING_METHOD_EXIF_IFD_VALUE_NOT_DEFINED = 1; public static final int SENSING_METHOD_EXIF_IFD_VALUE_ONE_CHIP_COLOR_AREA = 2; @@ -395,130 +406,142 @@ public interface ExifTagConstants public static final int SENSING_METHOD_EXIF_IFD_VALUE_TRILINEAR = 7; public static final int SENSING_METHOD_EXIF_IFD_VALUE_COLOR_SEQUENTIAL_LINEAR = 8; public static final TagInfoUndefined EXIF_TAG_FILE_SOURCE = new TagInfoUndefined( - "File Source", 0xa300, 1, + "FileSource", 0xa300, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); public static final int FILE_SOURCE_VALUE_FILM_SCANNER = 1; public static final int FILE_SOURCE_VALUE_REFLECTION_PRINT_SCANNER = 2; public static final int FILE_SOURCE_VALUE_DIGITAL_CAMERA = 3; - public static final TagInfoUndefined EXIF_TAG_SCENE_TYPE = new TagInfoUndefined("Scene Type", - 0xa301, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - public static final TagInfoUndefined EXIF_TAG_CFAPATTERN = new TagInfoUndefined("CFAPattern", - 0xa302, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); + public static final TagInfoUndefined EXIF_TAG_SCENE_TYPE = new TagInfoUndefined( + "SceneType", 0xa301, 1, + TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); + public static final TagInfoUndefined EXIF_TAG_CFAPATTERN = new TagInfoUndefined( + "CFAPattern", 0xa302, 1, + TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); public static final TagInfoShort EXIF_TAG_CUSTOM_RENDERED = new TagInfoShort( - "Custom Rendered", 0xa401, 1, + "CustomRendered", 0xa401, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); public static final int CUSTOM_RENDERED_VALUE_NORMAL = 0; public static final int CUSTOM_RENDERED_VALUE_CUSTOM = 1; public static final TagInfoShort EXIF_TAG_EXPOSURE_MODE = new TagInfoShort( - "Exposure Mode", 0xa402, 1, + "ExposureMode", 0xa402, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); public static final int EXPOSURE_MODE_VALUE_AUTO = 0; public static final int EXPOSURE_MODE_VALUE_MANUAL = 1; public static final int EXPOSURE_MODE_VALUE_AUTO_BRACKET = 2; public static final TagInfoShort EXIF_TAG_WHITE_BALANCE_1 = new TagInfoShort( - "White Balance", 0xa403, 1, + "WhiteBalance", 0xa403, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); public static final int WHITE_BALANCE_1_VALUE_AUTO = 0; public static final int WHITE_BALANCE_1_VALUE_MANUAL = 1; public static final TagInfoRational EXIF_TAG_DIGITAL_ZOOM_RATIO = new TagInfoRational( - "Digital Zoom Ratio", 0xa404, 1, + "DigitalZoomRatio", 0xa404, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); public static final TagInfoShort EXIF_TAG_FOCAL_LENGTH_IN_35MM_FORMAT = new TagInfoShort( - "Focal Length In 3 5mm Format", 0xa405, 1, + "FocalLengthIn35mmFormat", 0xa405, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); public static final TagInfoShort EXIF_TAG_SCENE_CAPTURE_TYPE = new TagInfoShort( - "Scene Capture Type", 0xa406, 1, + "SceneCaptureType", 0xa406, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); public static final int SCENE_CAPTURE_TYPE_VALUE_STANDARD = 0; public static final int SCENE_CAPTURE_TYPE_VALUE_LANDSCAPE = 1; public static final int SCENE_CAPTURE_TYPE_VALUE_PORTRAIT = 2; public static final int SCENE_CAPTURE_TYPE_VALUE_NIGHT = 3; public static final TagInfoShort EXIF_TAG_GAIN_CONTROL = new TagInfoShort( - "Gain Control", 0xa407, 1, + "GainControl", 0xa407, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); public static final int GAIN_CONTROL_VALUE_NONE = 0; public static final int GAIN_CONTROL_VALUE_LOW_GAIN_UP = 1; public static final int GAIN_CONTROL_VALUE_HIGH_GAIN_UP = 2; public static final int GAIN_CONTROL_VALUE_LOW_GAIN_DOWN = 3; public static final int GAIN_CONTROL_VALUE_HIGH_GAIN_DOWN = 4; - public static final TagInfoShort EXIF_TAG_CONTRAST_1 = new TagInfoShort("Contrast", - 0xa408, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); + public static final TagInfoShort EXIF_TAG_CONTRAST_1 = new TagInfoShort( + "Contrast", 0xa408, 1, + TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); public static final int CONTRAST_1_VALUE_NORMAL = 0; public static final int CONTRAST_1_VALUE_LOW = 1; public static final int CONTRAST_1_VALUE_HIGH = 2; public static final TagInfoShort EXIF_TAG_SATURATION_1 = new TagInfoShort( - "Saturation", 0xa409, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); + "Saturation", 0xa409, 1, + TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); public static final int SATURATION_1_VALUE_NORMAL = 0; public static final int SATURATION_1_VALUE_LOW = 1; public static final int SATURATION_1_VALUE_HIGH = 2; - public static final TagInfoShort EXIF_TAG_SHARPNESS_1 = new TagInfoShort("Sharpness", - 0xa40a, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); + public static final TagInfoShort EXIF_TAG_SHARPNESS_1 = new TagInfoShort( + "Sharpness", 0xa40a, 1, + TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); public static final int SHARPNESS_1_VALUE_NORMAL = 0; public static final int SHARPNESS_1_VALUE_SOFT = 1; public static final int SHARPNESS_1_VALUE_HARD = 2; public static final TagInfoUndefined EXIF_TAG_DEVICE_SETTING_DESCRIPTION = new TagInfoUndefined( - "Device Setting Description", 0xa40b, - -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); + "DeviceSettingDescription", 0xa40b, -1, + TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoShort EXIF_TAG_SUBJECT_DISTANCE_RANGE = new TagInfoShort( - "Subject Distance Range", 0xa40c, 1, + "SubjectDistanceRange", 0xa40c, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); public static final int SUBJECT_DISTANCE_RANGE_VALUE_MACRO = 1; public static final int SUBJECT_DISTANCE_RANGE_VALUE_CLOSE = 2; public static final int SUBJECT_DISTANCE_RANGE_VALUE_DISTANT = 3; public static final TagInfoAscii EXIF_TAG_IMAGE_UNIQUE_ID = new TagInfoAscii( - "Image Unique ID", 0xa420, 1, + "ImageUniqueID", 0xa420, 1, + TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); + public static final TagInfoRational EXIF_TAG_GAMMA = new TagInfoRational( + "Gamma", 0xa500, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - public static final TagInfoRational EXIF_TAG_GAMMA = new TagInfoRational("Gamma", 0xa500, - 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); public static final TagInfoUnknown EXIF_TAG_ANNOTATIONS = new TagInfoUnknown( "Annotations", 0xc44f, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - public static final TagInfoUndefined EXIF_TAG_PRINT_IM = new TagInfoUndefined("Print IM", - 0xc4a5, 1, TiffDirectoryType.EXIF_DIRECTORY_IFD0); - public static final TagInfoByte EXIF_TAG_DNG_ADOBE_DATA = new TagInfoByte( - "DNG Adobe Data", 0xc634, -1, - TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - public static final TagInfoByte EXIF_TAG_DNG_PENTAX_DATA = new TagInfoByte( - "DNG Pentax Data", 0xc634, -1, - TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); + public static final TagInfoUndefined EXIF_TAG_PRINT_IM = new TagInfoUndefined( + "PrintIM", 0xc4a5, 1, + TiffDirectoryType.EXIF_DIRECTORY_IFD0); public static final TagInfoSLong EXIF_TAG_OFFSET_SCHEMA = new TagInfoSLong( - "Offset Schema", 0xea1d, 1, + "OffsetSchema", 0xea1d, 1, + TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); + public static final TagInfoAscii EXIF_TAG_OWNER_NAME = new TagInfoAscii( + "OwnerName", 0xfde8, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - public static final TagInfoAscii EXIF_TAG_OWNER_NAME = new TagInfoAscii("Owner Name", - 0xfde8, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); public static final TagInfoAscii EXIF_TAG_SERIAL_NUMBER = new TagInfoAscii( - "Serial Number", 0xfde9, 1, + "SerialNumber", 0xfde9, 1, + TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); + public static final TagInfoAscii EXIF_TAG_LENS = new TagInfoAscii( + "Lens", 0xfdea, 1, + TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); + public static final TagInfoAscii EXIF_TAG_RAW_FILE = new TagInfoAscii( + "RawFile", 0xfe4c, 1, + TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); + public static final TagInfoAscii EXIF_TAG_CONVERTER = new TagInfoAscii( + "Converter", 0xfe4d, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - public static final TagInfoAscii EXIF_TAG_LENS = new TagInfoAscii("Lens", 0xfdea, - 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - public static final TagInfoAscii EXIF_TAG_RAW_FILE = new TagInfoAscii("Raw File", - 0xfe4c, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - public static final TagInfoAscii EXIF_TAG_CONVERTER = new TagInfoAscii("Converter", - 0xfe4d, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); public static final TagInfoAscii EXIF_TAG_WHITE_BALANCE_2 = new TagInfoAscii( - "White Balance", 0xfe4e, 1, + "WhiteBalance", 0xfe4e, 1, + TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); + public static final TagInfoAscii EXIF_TAG_EXPOSURE = new TagInfoAscii( + "Exposure", 0xfe51, 1, + TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); + public static final TagInfoAscii EXIF_TAG_SHADOWS = new TagInfoAscii( + "Shadows", 0xfe52, 1, + TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); + public static final TagInfoAscii EXIF_TAG_BRIGHTNESS = new TagInfoAscii( + "Brightness", 0xfe53, 1, + TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); + public static final TagInfoAscii EXIF_TAG_CONTRAST_2 = new TagInfoAscii( + "Contrast", 0xfe54, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - public static final TagInfoAscii EXIF_TAG_EXPOSURE = new TagInfoAscii("Exposure", - 0xfe51, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - public static final TagInfoAscii EXIF_TAG_SHADOWS = new TagInfoAscii("Shadows", - 0xfe52, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - public static final TagInfoAscii EXIF_TAG_BRIGHTNESS = new TagInfoAscii("Brightness", - 0xfe53, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - public static final TagInfoAscii EXIF_TAG_CONTRAST_2 = new TagInfoAscii("Contrast", - 0xfe54, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); public static final TagInfoAscii EXIF_TAG_SATURATION_2 = new TagInfoAscii( - "Saturation", 0xfe55, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - public static final TagInfoAscii EXIF_TAG_SHARPNESS_2 = new TagInfoAscii("Sharpness", - 0xfe56, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - public static final TagInfoAscii EXIF_TAG_SMOOTHNESS = new TagInfoAscii("Smoothness", - 0xfe57, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); + "Saturation", 0xfe55, 1, + TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); + public static final TagInfoAscii EXIF_TAG_SHARPNESS_2 = new TagInfoAscii( + "Sharpness", 0xfe56, 1, + TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); + public static final TagInfoAscii EXIF_TAG_SMOOTHNESS = new TagInfoAscii( + "Smoothness", 0xfe57, 1, + TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); public static final TagInfoAscii EXIF_TAG_MOIRE_FILTER = new TagInfoAscii( - "Moire Filter", 0xfe58, 1, + "MoireFilter", 0xfe58, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); public static final List ALL_EXIF_TAGS = Collections.unmodifiableList(Arrays.asList( - EXIF_TAG_INTEROP_INDEX, EXIF_TAG_INTEROP_VERSION, + EXIF_TAG_INTEROPERABILITY_INDEX, EXIF_TAG_INTEROPERABILITY_VERSION, EXIF_TAG_PROCESSING_SOFTWARE, EXIF_TAG_SOFTWARE, EXIF_TAG_PREVIEW_IMAGE_START_IFD0, @@ -586,7 +609,6 @@ public interface ExifTagConstants EXIF_TAG_SUBJECT_DISTANCE_RANGE, EXIF_TAG_IMAGE_UNIQUE_ID, EXIF_TAG_GAMMA, EXIF_TAG_ANNOTATIONS, EXIF_TAG_PRINT_IM, - EXIF_TAG_DNG_ADOBE_DATA, EXIF_TAG_DNG_PENTAX_DATA, EXIF_TAG_OFFSET_SCHEMA, EXIF_TAG_OWNER_NAME, EXIF_TAG_SERIAL_NUMBER, EXIF_TAG_LENS, EXIF_TAG_RAW_FILE, EXIF_TAG_CONVERTER, EXIF_TAG_WHITE_BALANCE_2, EXIF_TAG_EXPOSURE, Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/GdalLibraryTagConstants.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/GdalLibraryTagConstants.java?rev=1357065&r1=1357064&r2=1357065&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/GdalLibraryTagConstants.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/GdalLibraryTagConstants.java Wed Jul 4 04:21:03 2012 @@ -31,16 +31,16 @@ import org.apache.commons.imaging.format * http://www.awaresystems.be/imaging/tiff/tifftags/gdal_nodata.html */ public interface GdalLibraryTagConstants { - public static final TagInfoAscii EXIF_TAG_GDALMETADATA = new TagInfoAscii( + public static final TagInfoAscii EXIF_TAG_GDAL_METADATA = new TagInfoAscii( "GDALMetadata", 0xa480, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - public static final TagInfoAscii EXIF_TAG_GDALNO_DATA = new TagInfoAscii( - "GDALNo Data", 0xa481, -1, + public static final TagInfoAscii EXIF_TAG_GDAL_NO_DATA = new TagInfoAscii( + "GDALNoData", 0xa481, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final List ALL_GDAL_LIBRARY_TAGS = Collections.unmodifiableList(Arrays.asList(new TagInfo[] { - EXIF_TAG_GDALMETADATA, - EXIF_TAG_GDALNO_DATA})); + EXIF_TAG_GDAL_METADATA, + EXIF_TAG_GDAL_NO_DATA})); } Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/GeoTiffTagConstants.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/GeoTiffTagConstants.java?rev=1357065&r1=1357064&r2=1357065&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/GeoTiffTagConstants.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/GeoTiffTagConstants.java Wed Jul 4 04:21:03 2012 @@ -31,42 +31,42 @@ import org.apache.commons.imaging.format * http://www.remotesensing.org/geotiff/spec/contents.html */ public interface GeoTiffTagConstants { - public static final TagInfoDouble EXIF_TAG_MODEL_PIXEL_SCALE = new TagInfoDouble( - "Model Pixel Scale", 0x830e, 3, + public static final TagInfoDouble EXIF_TAG_MODEL_PIXEL_SCALE_TAG = new TagInfoDouble( + "ModelPixelScaleTag", 0x830e, 3, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - public static final TagInfoDouble EXIF_TAG_INTERGRAPH_MATRIX = new TagInfoDouble( - "Intergraph Matrix", 0x8480, -1, + public static final TagInfoDouble EXIF_TAG_INTERGRAPH_MATRIX_TAG = new TagInfoDouble( + "IntergraphMatrixTag", 0x8480, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - public static final TagInfoDouble EXIF_TAG_MODEL_TIE_POINT = new TagInfoDouble( - "Model Tie Point", 0x8482, -1, + public static final TagInfoDouble EXIF_TAG_MODEL_TIEPOINT_TAG = new TagInfoDouble( + "ModelTiepointTag", 0x8482, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - public static final TagInfoDouble EXIF_TAG_MODEL_TRANSFORMATION = new TagInfoDouble( - "Model Transformation", 0x85d8, 16, + public static final TagInfoDouble EXIF_TAG_MODEL_TRANSFORMATION_TAG = new TagInfoDouble( + "ModelTransformationTag", 0x85d8, 16, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - public static final TagInfoShort EXIF_TAG_GEO_TIFF_DIRECTORY = new TagInfoShort( - "Geo Tiff Directory", 0x87af, -1, + public static final TagInfoShort EXIF_TAG_GEO_KEY_DIRECTORY_TAG = new TagInfoShort( + "GeoKeyDirectoryTag", 0x87af, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - public static final TagInfoDouble EXIF_TAG_GEO_TIFF_DOUBLE_PARAMS = new TagInfoDouble( - "Geo Tiff Double Params", 0x87b0, -1, + public static final TagInfoDouble EXIF_TAG_GEO_DOUBLE_PARAMS_TAG = new TagInfoDouble( + "GeoDoubleParamsTag", 0x87b0, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - public static final TagInfoAscii EXIF_TAG_GEO_TIFF_ASCII_PARAMS = new TagInfoAscii( - "Geo Tiff Ascii Params", 0x87b1, -1, + public static final TagInfoAscii EXIF_TAG_GEO_ASCII_PARAMS_TAG = new TagInfoAscii( + "GeoAsciiParamsTag", 0x87b1, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final List ALL_GEO_TIFF_TAGS = Collections.unmodifiableList(Arrays.asList( - EXIF_TAG_MODEL_PIXEL_SCALE, - EXIF_TAG_INTERGRAPH_MATRIX, - EXIF_TAG_MODEL_TIE_POINT, - EXIF_TAG_MODEL_TRANSFORMATION, - EXIF_TAG_GEO_TIFF_DIRECTORY, - EXIF_TAG_GEO_TIFF_DOUBLE_PARAMS, - EXIF_TAG_GEO_TIFF_ASCII_PARAMS)); + EXIF_TAG_MODEL_PIXEL_SCALE_TAG, + EXIF_TAG_INTERGRAPH_MATRIX_TAG, + EXIF_TAG_MODEL_TIEPOINT_TAG, + EXIF_TAG_MODEL_TRANSFORMATION_TAG, + EXIF_TAG_GEO_KEY_DIRECTORY_TAG, + EXIF_TAG_GEO_DOUBLE_PARAMS_TAG, + EXIF_TAG_GEO_ASCII_PARAMS_TAG)); } Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/GpsTagConstants.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/GpsTagConstants.java?rev=1357065&r1=1357064&r2=1357065&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/GpsTagConstants.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/GpsTagConstants.java Wed Jul 4 04:21:03 2012 @@ -30,77 +30,77 @@ import org.apache.commons.imaging.format public interface GpsTagConstants extends TiffFieldTypeConstants { public static final TagInfoByte GPS_TAG_GPS_VERSION_ID = new TagInfoByte( - "GPS Version ID", 0x0000, 4, + "GPSVersionID", 0x0000, 4, TiffDirectoryType.EXIF_DIRECTORY_GPS); // ************************************************************ public static final TagInfoAscii GPS_TAG_GPS_LATITUDE_REF = new TagInfoAscii( - "GPS Latitude Ref", 0x0001, 2, + "GPSLatitudeRef", 0x0001, 2, TiffDirectoryType.EXIF_DIRECTORY_GPS); public static final String GPS_TAG_GPS_LATITUDE_REF_VALUE_NORTH = "N"; public static final String GPS_TAG_GPS_LATITUDE_REF_VALUE_SOUTH = "S"; // ************************************************************ public static final TagInfoRational GPS_TAG_GPS_LATITUDE = new TagInfoRational( - "GPS Latitude", 0x0002, 3, + "GPSLatitude", 0x0002, 3, TiffDirectoryType.EXIF_DIRECTORY_GPS); // ************************************************************ public static final TagInfoAscii GPS_TAG_GPS_LONGITUDE_REF = new TagInfoAscii( - "GPS Longitude Ref", 0x0003, 2, + "GPSLongitudeRef", 0x0003, 2, TiffDirectoryType.EXIF_DIRECTORY_GPS); public static final String GPS_TAG_GPS_LONGITUDE_REF_VALUE_EAST = "E"; public static final String GPS_TAG_GPS_LONGITUDE_REF_VALUE_WEST = "W"; // ************************************************************ public static final TagInfoRational GPS_TAG_GPS_LONGITUDE = new TagInfoRational( - "GPS Longitude", 0x0004, 3, + "GPSLongitude", 0x0004, 3, TiffDirectoryType.EXIF_DIRECTORY_GPS); // ************************************************************ public static final TagInfoByte GPS_TAG_GPS_ALTITUDE_REF = new TagInfoByte( - "GPS Altitude Ref", 0x0005, 1, + "GPSAltitudeRef", 0x0005, 1, TiffDirectoryType.EXIF_DIRECTORY_GPS); public static final int GPS_TAG_GPS_ALTITUDE_REF_VALUE_ABOVE_SEA_LEVEL = 0; public static final int GPS_TAG_GPS_ALTITUDE_REF_VALUE_BELOW_SEA_LEVEL = 1; // ************************************************************ public static final TagInfoRational GPS_TAG_GPS_ALTITUDE = new TagInfoRational( - "GPS Altitude", 0x0006, 1, + "GPSAltitude", 0x0006, 1, TiffDirectoryType.EXIF_DIRECTORY_GPS); // ************************************************************ public static final TagInfoRational GPS_TAG_GPS_TIME_STAMP = new TagInfoRational( - "GPS Time Stamp", 0x0007, 3, + "GPSTimeStamp", 0x0007, 3, TiffDirectoryType.EXIF_DIRECTORY_GPS); // ************************************************************ public static final TagInfoAscii GPS_TAG_GPS_SATELLITES = new TagInfoAscii( - "GPS Satellites", 0x0008, -1, + "GPSSatellites", 0x0008, -1, TiffDirectoryType.EXIF_DIRECTORY_GPS); // ************************************************************ public static final TagInfoAscii GPS_TAG_GPS_STATUS = new TagInfoAscii( - "GPS Status", 0x0009, 2, + "GPSStatus", 0x0009, 2, TiffDirectoryType.EXIF_DIRECTORY_GPS); public static final String GPS_TAG_GPS_STATUS_VALUE_MEASUREMENT_IN_PROGRESS = "A"; public static final String GPS_TAG_GPS_STATUS_VALUE_MEASUREMENT_INTEROPERABILITY = "V"; // ************************************************************ public static final TagInfoAscii GPS_TAG_GPS_MEASURE_MODE = new TagInfoAscii( - "GPS Measure Mode", 0x000a, 2, + "GPSMeasureMode", 0x000a, 2, TiffDirectoryType.EXIF_DIRECTORY_GPS); public static final int GPS_TAG_GPS_MEASURE_MODE_VALUE_2_DIMENSIONAL_MEASUREMENT = 2; public static final int GPS_TAG_GPS_MEASURE_MODE_VALUE_3_DIMENSIONAL_MEASUREMENT = 3; // ************************************************************ public static final TagInfoRational GPS_TAG_GPS_DOP = new TagInfoRational( - "GPS DOP", 0x000b, 1, + "GPSDOP", 0x000b, 1, TiffDirectoryType.EXIF_DIRECTORY_GPS); // ************************************************************ public static final TagInfoAscii GPS_TAG_GPS_SPEED_REF = new TagInfoAscii( - "GPS Speed Ref", 0x000c, 2, + "GPSSpeedRef", 0x000c, 2, TiffDirectoryType.EXIF_DIRECTORY_GPS); public static final String GPS_TAG_GPS_SPEED_REF_VALUE_KMPH = "K"; @@ -108,77 +108,77 @@ public interface GpsTagConstants public static final String GPS_TAG_GPS_SPEED_REF_VALUE_KNOTS = "N"; // ************************************************************ public static final TagInfoRational GPS_TAG_GPS_SPEED = new TagInfoRational( - "GPS Speed", 0x000d, 1, + "GPSSpeed", 0x000d, 1, TiffDirectoryType.EXIF_DIRECTORY_GPS); // ************************************************************ public static final TagInfoAscii GPS_TAG_GPS_TRACK_REF = new TagInfoAscii( - "GPS Track Ref", 0x000e, 2, + "GPSTrackRef", 0x000e, 2, TiffDirectoryType.EXIF_DIRECTORY_GPS); public static final String GPS_TAG_GPS_TRACK_REF_VALUE_MAGNETIC_NORTH = "M"; public static final String GPS_TAG_GPS_TRACK_REF_VALUE_TRUE_NORTH = "T"; // ************************************************************ public static final TagInfoRational GPS_TAG_GPS_TRACK = new TagInfoRational( - "GPS Track", 0x000f, 1, + "GPSTrack", 0x000f, 1, TiffDirectoryType.EXIF_DIRECTORY_GPS); // ************************************************************ public static final TagInfoAscii GPS_TAG_GPS_IMG_DIRECTION_REF = new TagInfoAscii( - "GPS Img Direction Ref", 0x0010, 2, + "GPSImgDirectionRef", 0x0010, 2, TiffDirectoryType.EXIF_DIRECTORY_GPS); public static final String GPS_TAG_GPS_IMG_DIRECTION_REF_VALUE_MAGNETIC_NORTH = "M"; public static final String GPS_TAG_GPS_IMG_DIRECTION_REF_VALUE_TRUE_NORTH = "T"; // ************************************************************ public static final TagInfoRational GPS_TAG_GPS_IMG_DIRECTION = new TagInfoRational( - "GPS Img Direction", 0x0011, 1, + "GPSImgDirection", 0x0011, 1, TiffDirectoryType.EXIF_DIRECTORY_GPS); // ************************************************************ public static final TagInfoAscii GPS_TAG_GPS_MAP_DATUM = new TagInfoAscii( - "GPS Map Datum", 0x0012, -1, + "GPSMapDatum", 0x0012, -1, TiffDirectoryType.EXIF_DIRECTORY_GPS); // ************************************************************ public static final TagInfoAscii GPS_TAG_GPS_DEST_LATITUDE_REF = new TagInfoAscii( - "GPS Dest Latitude Ref", 0x0013, 2, + "GPSDestLatitudeRef", 0x0013, 2, TiffDirectoryType.EXIF_DIRECTORY_GPS); public static final String GPS_TAG_GPS_DEST_LATITUDE_REF_VALUE_NORTH = "N"; public static final String GPS_TAG_GPS_DEST_LATITUDE_REF_VALUE_SOUTH = "S"; // ************************************************************ public static final TagInfoRational GPS_TAG_GPS_DEST_LATITUDE = new TagInfoRational( - "GPS Dest Latitude", 0x0014, 3, + "GPSDestLatitude", 0x0014, 3, TiffDirectoryType.EXIF_DIRECTORY_GPS); // ************************************************************ public static final TagInfoAscii GPS_TAG_GPS_DEST_LONGITUDE_REF = new TagInfoAscii( - "GPS Dest Longitude Ref", 0x0015, 2, + "GPSDestLongitudeRef", 0x0015, 2, TiffDirectoryType.EXIF_DIRECTORY_GPS); public static final String GPS_TAG_GPS_DEST_LONGITUDE_REF_VALUE_EAST = "E"; public static final String GPS_TAG_GPS_DEST_LONGITUDE_REF_VALUE_WEST = "W"; // ************************************************************ public static final TagInfoRational GPS_TAG_GPS_DEST_LONGITUDE = new TagInfoRational( - "GPS Dest Longitude", 0x0016, 3, + "GPSDestLongitude", 0x0016, 3, TiffDirectoryType.EXIF_DIRECTORY_GPS); // ************************************************************ public static final TagInfoAscii GPS_TAG_GPS_DEST_BEARING_REF = new TagInfoAscii( - "GPS Dest Bearing Ref", 0x0017, 2, + "GPSDestBearingRef", 0x0017, 2, TiffDirectoryType.EXIF_DIRECTORY_GPS); public static final String GPS_TAG_GPS_DEST_BEARING_REF_VALUE_MAGNETIC_NORTH = "M"; public static final String GPS_TAG_GPS_DEST_BEARING_REF_VALUE_TRUE_NORTH = "T"; // ************************************************************ public static final TagInfoRational GPS_TAG_GPS_DEST_BEARING = new TagInfoRational( - "GPS Dest Bearing", 0x0018, 1, + "GPSDestBearing", 0x0018, 1, TiffDirectoryType.EXIF_DIRECTORY_GPS); // ************************************************************ public static final TagInfoAscii GPS_TAG_GPS_DEST_DISTANCE_REF = new TagInfoAscii( - "GPS Dest Distance Ref", 0x0019, 2, + "GPSDestDistanceRef", 0x0019, 2, TiffDirectoryType.EXIF_DIRECTORY_GPS); public static final String GPS_TAG_GPS_DEST_DISTANCE_REF_VALUE_KILOMETERS = "K"; @@ -186,27 +186,27 @@ public interface GpsTagConstants public static final String GPS_TAG_GPS_DEST_DISTANCE_REF_VALUE_NAUTICAL_MILES = "N"; // ************************************************************ public static final TagInfoRational GPS_TAG_GPS_DEST_DISTANCE = new TagInfoRational( - "GPS Dest Distance", 0x001a, 1, + "GPSDestDistance", 0x001a, 1, TiffDirectoryType.EXIF_DIRECTORY_GPS); // ************************************************************ public static final TagInfoGpsText GPS_TAG_GPS_PROCESSING_METHOD = new TagInfoGpsText( - "GPS Processing Method", 0x001b, FIELD_TYPE_UNKNOWN, + "GPSProcessingMethod", 0x001b, FIELD_TYPE_UNKNOWN, -1, TiffDirectoryType.EXIF_DIRECTORY_GPS); // ************************************************************ public static final TagInfoGpsText GPS_TAG_GPS_AREA_INFORMATION = new TagInfoGpsText( - "GPS Area Information", 0x001c, FIELD_TYPE_UNKNOWN, -1, + "GPSAreaInformation", 0x001c, FIELD_TYPE_UNKNOWN, -1, TiffDirectoryType.EXIF_DIRECTORY_GPS); // ************************************************************ public static final TagInfoAscii GPS_TAG_GPS_DATE_STAMP = new TagInfoAscii( - "GPS Date Stamp", 0x001d, 11, + "GPSDateStamp", 0x001d, 11, TiffDirectoryType.EXIF_DIRECTORY_GPS); // ************************************************************ public static final TagInfoShort GPS_TAG_GPS_DIFFERENTIAL = new TagInfoShort( - "GPS Differential", 0x001e, 1, + "GPSDifferential", 0x001e, 1, TiffDirectoryType.EXIF_DIRECTORY_GPS); public static final int GPS_TAG_GPS_DIFFERENTIAL_VALUE_NO_CORRECTION = 0; Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/HylaFaxTagConstants.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/HylaFaxTagConstants.java?rev=1357065&r1=1357064&r2=1357065&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/HylaFaxTagConstants.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/HylaFaxTagConstants.java Wed Jul 4 04:21:03 2012 @@ -26,19 +26,19 @@ import org.apache.commons.imaging.format public interface HylaFaxTagConstants extends TiffFieldTypeConstants { public static final TagInfoLong EXIF_TAG_FAX_RECV_PARAMS = new TagInfoLong( - "Fax Recv Params", 0x885c, 1, + "FaxRecvParams", 0x885c, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoAscii EXIF_TAG_FAX_SUB_ADDRESS = new TagInfoAscii( - "Fax Sub Address", 0x885d, -1, + "FaxSubAddress", 0x885d, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoLong EXIF_TAG_FAX_RECV_TIME = new TagInfoLong( - "Fax Recv Time", 0x885e, 1, + "FaxRecvTime", 0x885e, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoAscii EXIF_TAG_FAX_DCS = new TagInfoAscii( - "Fax DCS", 0x885f, -1, + "FaxDCS", 0x885f, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final List ALL_HYLAFAX_TAGS =