You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by da...@apache.org on 2012/03/25 08:56:43 UTC
svn commit: r1304986 - in /commons/proper/sanselan/trunk/src:
main/java/org/apache/commons/sanselan/formats/tiff/constants/
test/java/org/apache/commons/sanselan/formats/tiff/
Author: damjan
Date: Sun Mar 25 06:56:43 2012
New Revision: 1304986
URL: http://svn.apache.org/viewvc?rev=1304986&view=rev
Log:
Factor out DNG and Alias Sketchbook Pro tags.
Add some newer DNG tags that were missing.
Added:
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/AliasSketchbookProTagConstants.java (with props)
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/DngTagConstants.java (with props)
Modified:
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/AllTagConstants.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/ExifTagConstants.java
commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/tiff/TiffTagIntegrityTest.java
Added: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/AliasSketchbookProTagConstants.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/AliasSketchbookProTagConstants.java?rev=1304986&view=auto
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/AliasSketchbookProTagConstants.java (added)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/AliasSketchbookProTagConstants.java Sun Mar 25 06:56:43 2012
@@ -0,0 +1,23 @@
+package org.apache.commons.sanselan.formats.tiff.constants;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.apache.commons.sanselan.formats.tiff.taginfos.TagInfo;
+import org.apache.commons.sanselan.formats.tiff.taginfos.TagInfoAscii;
+
+/**
+ * Alias Sketchbook Pro multi-layer TIFF
+ * <BR>
+ * http://www.awaresystems.be/imaging/tiff/tifftags/docs/alias.html
+ */
+public interface AliasSketchbookProTagConstants extends TiffFieldTypeConstants {
+ public static final TagInfoAscii EXIF_TAG_ALIAS_LAYER_METADATA = new TagInfoAscii(
+ "Alias Layer Metadata", 0xc660, -1,
+ TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
+
+ public static final List<TagInfo> ALL_ALIAS_SKETCHBOOK_PRO_TAGS =
+ Collections.unmodifiableList(Arrays.asList(new TagInfo[] {
+ EXIF_TAG_ALIAS_LAYER_METADATA}));
+}
Propchange: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/AliasSketchbookProTagConstants.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/AllTagConstants.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/AllTagConstants.java?rev=1304986&r1=1304985&r2=1304986&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/AllTagConstants.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/AllTagConstants.java Sun Mar 25 06:56:43 2012
@@ -24,7 +24,9 @@ import org.apache.commons.sanselan.forma
public interface AllTagConstants extends
AdobePhotoshopTagConstants,
AdobePageMaker6TagConstants,
+ AliasSketchbookProTagConstants,
DcfTagConstants,
+ DngTagConstants,
ExifTagConstants,
GpsTagConstants,
HylaFaxTagConstants,
@@ -41,7 +43,9 @@ public interface AllTagConstants extends
TagConstantsUtils.mergeTagLists(
AdobePageMaker6TagConstants.ALL_ADOBE_PAGEMAKER_6_TAGS,
AdobePhotoshopTagConstants.ALL_ADOBE_PHOTOSHOP_TAGS,
+ AliasSketchbookProTagConstants.ALL_ALIAS_SKETCHBOOK_PRO_TAGS,
DcfTagConstants.ALL_DCF_TAGS,
+ DngTagConstants.ALL_DNG_TAGS,
ExifTagConstants.ALL_EXIF_TAGS,
GpsTagConstants.ALL_GPS_TAGS,
HylaFaxTagConstants.ALL_HYLAFAX_TAGS,
Added: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/DngTagConstants.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/DngTagConstants.java?rev=1304986&view=auto
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/DngTagConstants.java (added)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/DngTagConstants.java Sun Mar 25 06:56:43 2012
@@ -0,0 +1,495 @@
+package org.apache.commons.sanselan.formats.tiff.constants;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.apache.commons.sanselan.formats.tiff.taginfos.TagInfo;
+import org.apache.commons.sanselan.formats.tiff.taginfos.TagInfoAscii;
+import org.apache.commons.sanselan.formats.tiff.taginfos.TagInfoByte;
+import org.apache.commons.sanselan.formats.tiff.taginfos.TagInfoDouble;
+import org.apache.commons.sanselan.formats.tiff.taginfos.TagInfoFloat;
+import org.apache.commons.sanselan.formats.tiff.taginfos.TagInfoLong;
+import org.apache.commons.sanselan.formats.tiff.taginfos.TagInfoRational;
+import org.apache.commons.sanselan.formats.tiff.taginfos.TagInfoSRational;
+import org.apache.commons.sanselan.formats.tiff.taginfos.TagInfoShort;
+import org.apache.commons.sanselan.formats.tiff.taginfos.TagInfoShortOrLong;
+import org.apache.commons.sanselan.formats.tiff.taginfos.TagInfoShortOrLongOrRational;
+import org.apache.commons.sanselan.formats.tiff.taginfos.TagInfoShortOrRational;
+import org.apache.commons.sanselan.formats.tiff.taginfos.TagInfoUndefined;
+
+/**
+ * Digital Negative (DNG) Specification
+ * <BR>
+ * http://www.adobe.com/products/dng/pdfs/dng_spec_1_3_0_0.pdf
+ */
+public interface DngTagConstants extends TiffFieldTypeConstants {
+ public static final TagInfoByte EXIF_TAG_DNG_VERSION = new TagInfoByte(
+ "DNG Version", 0xc612, 4,
+ TiffDirectoryType.EXIF_DIRECTORY_IFD0);
+
+ public static final TagInfoByte EXIF_TAG_DNG_BACKWARD_VERSION = new TagInfoByte(
+ "DNG Backward Version", 0xc613, 4,
+ TiffDirectoryType.EXIF_DIRECTORY_IFD0);
+
+ public static final TagInfoAscii EXIF_TAG_UNIQUE_CAMERA_MODEL = new TagInfoAscii(
+ "Unique Camera Model", 0xc614, -1,
+ TiffDirectoryType.EXIF_DIRECTORY_IFD0);
+
+ // FIXME: byte or ascii
+ public static final TagInfoAscii EXIF_TAG_LOCALIZED_CAMERA_MODEL = new TagInfoAscii(
+ "Localized Camera Model", 0xc615, -1,
+ TiffDirectoryType.EXIF_DIRECTORY_IFD0);
+
+ public static final TagInfoByte EXIF_TAG_CFAPLANE_COLOR = new TagInfoByte(
+ "CFAPlane Color", 0xc616, -1,
+ TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
+
+ public static final TagInfoShort EXIF_TAG_CFALAYOUT = new TagInfoShort(
+ "CFALayout", 0xc617, 1,
+ TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
+ public static final int CFALAYOUT_VALUE_RECTANGULAR = 1;
+ public static final int CFALAYOUT_VALUE_EVEN_COLUMNS_OFFSET_DOWN_1_2_ROW = 2;
+ public static final int CFALAYOUT_VALUE_EVEN_COLUMNS_OFFSET_UP_1_2_ROW = 3;
+ public static final int CFALAYOUT_VALUE_EVEN_ROWS_OFFSET_RIGHT_1_2_COLUMN = 4;
+ public static final int CFALAYOUT_VALUE_EVEN_ROWS_OFFSET_LEFT_1_2_COLUMN = 5;
+ public static final int CFALAYOUT_VALUE_EVEN_ROWS_OFFSET_UP_1_2_ROW_EVEN_COLUMNS_OFFSET_LEFT_1_2_COLUMN = 6;
+ public static final int CFALAYOUT_VALUE_EVEN_ROWS_OFFSET_UP_1_2_ROW_EVEN_COLUMNS_OFFSET_RIGHT_1_2_COLUMN = 7;
+ public static final int CFALAYOUT_VALUE_EVEN_ROWS_OFFSET_DOWN_1_2_ROW_EVEN_COLUMNS_OFFSET_LEFT_1_2_COLUMN = 8;
+ 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,
+ TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
+
+ public static final TagInfoShort EXIF_TAG_BLACK_LEVEL_REPEAT_DIM = new TagInfoShort(
+ "Black Level Repeat Dim", 0xc619,
+ 2, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
+
+ public static final TagInfoShortOrLongOrRational EXIF_TAG_BLACK_LEVEL = new TagInfoShortOrLongOrRational(
+ "Black Level", 0xc61a, -1,
+ TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
+
+ public static final TagInfoSRational EXIF_TAG_BLACK_LEVEL_DELTA_H = new TagInfoSRational(
+ "Black Level Delta H", 0xc61b, -1,
+ TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
+
+ public static final TagInfoSRational EXIF_TAG_BLACK_LEVEL_DELTA_V = new TagInfoSRational(
+ "Black Level Delta V", 0xc61c, -1,
+ TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
+
+ public static final TagInfoShortOrLong EXIF_TAG_WHITE_LEVEL = new TagInfoShortOrLong(
+ "White Level", 0xc61d, -1,
+ TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
+
+ public static final TagInfoRational EXIF_TAG_DEFAULT_SCALE = new TagInfoRational(
+ "Default Scale", 0xc61e, 2,
+ TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
+
+ public static final TagInfoShortOrLongOrRational EXIF_TAG_DEFAULT_CROP_ORIGIN = new TagInfoShortOrLongOrRational(
+ "Default Crop Origin", 0xc61f, 2,
+ TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
+
+ public static final TagInfoShortOrLongOrRational EXIF_TAG_DEFAULT_CROP_SIZE = new TagInfoShortOrLongOrRational(
+ "Default Crop Size", 0xc620, 2,
+ TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
+
+ public static final TagInfoSRational EXIF_TAG_COLOR_MATRIX_1 = new TagInfoSRational(
+ "Color Matrix 1", 0xc621, -1,
+ TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
+
+ public static final TagInfoSRational EXIF_TAG_COLOR_MATRIX_2 = new TagInfoSRational(
+ "Color Matrix 2", 0xc622, -1,
+ TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
+
+ public static final TagInfoSRational EXIF_TAG_CAMERA_CALIBRATION_1 = new TagInfoSRational(
+ "Camera Calibration 1", 0xc623, -1,
+ TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
+
+ public static final TagInfoSRational EXIF_TAG_CAMERA_CALIBRATION_2 = new TagInfoSRational(
+ "Camera Calibration 2", 0xc624, -1,
+ TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
+
+ public static final TagInfoSRational EXIF_TAG_REDUCTION_MATRIX_1 = new TagInfoSRational(
+ "Reduction Matrix 1", 0xc625, -1,
+ TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
+
+ public static final TagInfoSRational EXIF_TAG_REDUCTION_MATRIX_2 = new TagInfoSRational(
+ "Reduction Matrix 2", 0xc626, -1,
+ TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
+
+ public static final TagInfoRational EXIF_TAG_ANALOG_BALANCE = new TagInfoRational(
+ "Analog Balance", 0xc627, -1,
+ TiffDirectoryType.EXIF_DIRECTORY_IFD0);
+
+ public static final TagInfoShortOrRational EXIF_TAG_AS_SHOT_NEUTRAL = new TagInfoShortOrRational(
+ "As Shot Neutral", 0xc628, -1,
+ TiffDirectoryType.EXIF_DIRECTORY_IFD0);
+
+ public static final TagInfoRational EXIF_TAG_AS_SHOT_WHITE_XY = new TagInfoRational(
+ "As Shot White XY", 0xc629, 2,
+ TiffDirectoryType.EXIF_DIRECTORY_IFD0);
+
+ public static final TagInfoSRational EXIF_TAG_BASELINE_EXPOSURE = new TagInfoSRational(
+ "Baseline Exposure", 0xc62a, 1,
+ TiffDirectoryType.EXIF_DIRECTORY_IFD0);
+
+ public static final TagInfoRational EXIF_TAG_BASELINE_NOISE = new TagInfoRational(
+ "Baseline Noise", 0xc62b, 1,
+ TiffDirectoryType.EXIF_DIRECTORY_IFD0);
+
+ public static final TagInfoRational EXIF_TAG_BASELINE_SHARPNESS = new TagInfoRational(
+ "Baseline Sharpness", 0xc62c, 1,
+ TiffDirectoryType.EXIF_DIRECTORY_IFD0);
+
+ public static final TagInfoLong EXIF_TAG_BAYER_GREEN_SPLIT = new TagInfoLong(
+ "Bayer Green Split", 0xc62d, 1,
+ TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
+
+ public static final TagInfoRational EXIF_TAG_LINEAR_RESPONSE_LIMIT = new TagInfoRational(
+ "Linear Response Limit", 0xc62e, 1,
+ TiffDirectoryType.EXIF_DIRECTORY_IFD0);
+
+ public static final TagInfoAscii EXIF_TAG_CAMERA_SERIAL_NUMBER = new TagInfoAscii(
+ "Camera Serial Number", 0xc62f, -1,
+ TiffDirectoryType.EXIF_DIRECTORY_IFD0);
+
+ public static final TagInfoRational EXIF_TAG_DNG_LENS_INFO = new TagInfoRational(
+ "DNG Lens Info", 0xc630, 4,
+ TiffDirectoryType.EXIF_DIRECTORY_IFD0);
+
+ public static final TagInfoRational EXIF_TAG_CHROMA_BLUR_RADIUS = new TagInfoRational(
+ "Chroma Blur Radius", 0xc631, 1,
+ TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
+
+ public static final TagInfoRational EXIF_TAG_ANTI_ALIAS_STRENGTH = new TagInfoRational(
+ "Anti Alias Strength", 0xc632, 1,
+ TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
+
+ public static final TagInfoRational EXIF_TAG_SHADOW_SCALE = new TagInfoRational(
+ "Shadow Scale", 0xc633, 1,
+ TiffDirectoryType.EXIF_DIRECTORY_IFD0);
+
+ public static final TagInfoByte EXIF_TAG_DNG_PRIVATE_DATA = new TagInfoByte(
+ "DNG Private Data", 0xc634, -1,
+ TiffDirectoryType.EXIF_DIRECTORY_IFD0);
+
+ public static final TagInfoShort EXIF_TAG_MAKER_NOTE_SAFETY = new TagInfoShort(
+ "Maker Note Safety", 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,
+ TiffDirectoryType.EXIF_DIRECTORY_IFD0);
+ public static final int CALIBRATION_ILLUMINANT_1_VALUE_DAYLIGHT = 1;
+ public static final int CALIBRATION_ILLUMINANT_1_VALUE_FLUORESCENT = 2;
+ public static final int CALIBRATION_ILLUMINANT_1_VALUE_TUNGSTEN = 3;
+ public static final int CALIBRATION_ILLUMINANT_1_VALUE_FLASH = 4;
+ public static final int CALIBRATION_ILLUMINANT_1_VALUE_FINE_WEATHER = 9;
+ public static final int CALIBRATION_ILLUMINANT_1_VALUE_CLOUDY = 10;
+ public static final int CALIBRATION_ILLUMINANT_1_VALUE_SHADE = 11;
+ public static final int CALIBRATION_ILLUMINANT_1_VALUE_DAYLIGHT_FLUORESCENT = 12;
+ public static final int CALIBRATION_ILLUMINANT_1_VALUE_DAY_WHITE_FLUORESCENT = 13;
+ public static final int CALIBRATION_ILLUMINANT_1_VALUE_COOL_WHITE_FLUORESCENT = 14;
+ public static final int CALIBRATION_ILLUMINANT_1_VALUE_WHITE_FLUORESCENT = 15;
+ public static final int CALIBRATION_ILLUMINANT_1_VALUE_STANDARD_LIGHT_A = 17;
+ public static final int CALIBRATION_ILLUMINANT_1_VALUE_STANDARD_LIGHT_B = 18;
+ public static final int CALIBRATION_ILLUMINANT_1_VALUE_STANDARD_LIGHT_C = 19;
+ public static final int CALIBRATION_ILLUMINANT_1_VALUE_D55 = 20;
+ public static final int CALIBRATION_ILLUMINANT_1_VALUE_D65 = 21;
+ public static final int CALIBRATION_ILLUMINANT_1_VALUE_D75 = 22;
+ public static final int CALIBRATION_ILLUMINANT_1_VALUE_D50 = 23;
+ public static final int CALIBRATION_ILLUMINANT_1_VALUE_ISO_STUDIO_TUNGSTEN = 24;
+ 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,
+ TiffDirectoryType.EXIF_DIRECTORY_IFD0);
+ public static final int CALIBRATION_ILLUMINANT_2_VALUE_DAYLIGHT = 1;
+ public static final int CALIBRATION_ILLUMINANT_2_VALUE_FLUORESCENT = 2;
+ public static final int CALIBRATION_ILLUMINANT_2_VALUE_TUNGSTEN = 3;
+ public static final int CALIBRATION_ILLUMINANT_2_VALUE_FLASH = 4;
+ public static final int CALIBRATION_ILLUMINANT_2_VALUE_FINE_WEATHER = 9;
+ public static final int CALIBRATION_ILLUMINANT_2_VALUE_CLOUDY = 10;
+ public static final int CALIBRATION_ILLUMINANT_2_VALUE_SHADE = 11;
+ public static final int CALIBRATION_ILLUMINANT_2_VALUE_DAYLIGHT_FLUORESCENT = 12;
+ public static final int CALIBRATION_ILLUMINANT_2_VALUE_DAY_WHITE_FLUORESCENT = 13;
+ public static final int CALIBRATION_ILLUMINANT_2_VALUE_COOL_WHITE_FLUORESCENT = 14;
+ public static final int CALIBRATION_ILLUMINANT_2_VALUE_WHITE_FLUORESCENT = 15;
+ public static final int CALIBRATION_ILLUMINANT_2_VALUE_STANDARD_LIGHT_A = 17;
+ public static final int CALIBRATION_ILLUMINANT_2_VALUE_STANDARD_LIGHT_B = 18;
+ public static final int CALIBRATION_ILLUMINANT_2_VALUE_STANDARD_LIGHT_C = 19;
+ public static final int CALIBRATION_ILLUMINANT_2_VALUE_D55 = 20;
+ public static final int CALIBRATION_ILLUMINANT_2_VALUE_D65 = 21;
+ public static final int CALIBRATION_ILLUMINANT_2_VALUE_D75 = 22;
+ public static final int CALIBRATION_ILLUMINANT_2_VALUE_D50 = 23;
+ public static final int CALIBRATION_ILLUMINANT_2_VALUE_ISO_STUDIO_TUNGSTEN = 24;
+ 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,
+ TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
+
+ public static final TagInfoByte EXIF_TAG_RAW_DATA_UNIQUE_ID = new TagInfoByte(
+ "Raw Data Unique ID", 0xc65d, 16,
+ TiffDirectoryType.EXIF_DIRECTORY_IFD0);
+
+ // FIXME: byte or ascii
+ public static final TagInfoAscii EXIF_TAG_ORIGINAL_RAW_FILE_NAME = new TagInfoAscii(
+ "Original Raw File Name", 0xc68b, -1,
+ TiffDirectoryType.EXIF_DIRECTORY_IFD0);
+
+ public static final TagInfoUndefined EXIF_TAG_ORIGINAL_RAW_FILE_DATA = new TagInfoUndefined(
+ "Original Raw File Data", 0xc68c, -1,
+ TiffDirectoryType.EXIF_DIRECTORY_IFD0);
+
+ public static final TagInfoShortOrLong EXIF_TAG_ACTIVE_AREA = new TagInfoShortOrLong(
+ "Active Area", 0xc68d, 4,
+ TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
+
+ public static final TagInfoShortOrLong EXIF_TAG_MASKED_AREAS = new TagInfoShortOrLong(
+ "Masked Areas", 0xc68e, 4,
+ TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
+
+ public static final TagInfoUndefined EXIF_TAG_AS_SHOT_ICCPROFILE = new TagInfoUndefined(
+ "As Shot ICCProfile", 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,
+ TiffDirectoryType.EXIF_DIRECTORY_IFD0);
+
+ public static final TagInfoUndefined EXIF_TAG_CURRENT_ICCPROFILE = new TagInfoUndefined(
+ "Current ICCProfile", 0xc691, -1,
+ TiffDirectoryType.EXIF_DIRECTORY_IFD0);
+
+ public static final TagInfoSRational EXIF_TAG_CURRENT_PRE_PROFILE_MATRIX = new TagInfoSRational(
+ "Current Pre Profile Matrix", 0xc692, -1,
+ TiffDirectoryType.EXIF_DIRECTORY_IFD0);
+
+ public static final TagInfoShort EXIF_TAG_COLORIMETRIC_REFERENCE = new TagInfoShort(
+ "Colorimetric Reference", 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;
+
+ // FIXME: ascii or byte
+ public static final TagInfoAscii EXIF_TAG_CAMERA_CALIBRATION_SIGNATURE = new TagInfoAscii(
+ "Camera Calibration Signature", 0xc6f3, -1,
+ TiffDirectoryType.EXIF_DIRECTORY_IFD0);
+
+ // FIXME: ascii or byte
+ public static final TagInfoAscii EXIF_TAG_PROFILE_CALIBRATION_SIGNATURE = new TagInfoAscii(
+ "Profile Calibration Signature", 0xc6f4, -1,
+ TiffDirectoryType.EXIF_DIRECTORY_IFD0);
+
+ public static final TagInfoLong EXIF_TAG_EXTRA_CAMERA_PROFILES = new TagInfoLong(
+ "Extra Camera Profiles", 0xc6f5, -1,
+ TiffDirectoryType.EXIF_DIRECTORY_IFD0);
+
+ // FIXME: ascii or byte
+ public static final TagInfoAscii EXIF_TAG_AS_SHOT_PROFILE_NAME = new TagInfoAscii(
+ "As Shot Profile Name", 0xc6f6, -1,
+ TiffDirectoryType.EXIF_DIRECTORY_IFD0);
+
+ public static final TagInfoRational EXIF_TAG_NOISE_REDUCTION_APPLIED = new TagInfoRational(
+ "Noise Reduction Applied", 0xc6f7, 1,
+ TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
+
+ public static final TagInfoAscii EXIF_TAG_PROFILE_NAME = new TagInfoAscii(
+ "Profile Name", 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,
+ TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
+
+ public static final TagInfoFloat EXIF_TAG_PROFILE_HUE_SAT_MAP_DATA1 = new TagInfoFloat(
+ "Profile Hue/Sat/Map Data1", 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,
+ TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
+
+ public static final TagInfoFloat EXIF_TAG_PROFILE_TONE_CURVE = new TagInfoFloat(
+ "Profile Tone Curve", 0xc6fc, -1,
+ TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
+
+ public static final TagInfoLong EXIF_TAG_PROFILE_EMBED_POLICY = new TagInfoLong(
+ "Profile Embed Policy", 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;
+ public static final int PROFILE_EMBED_POLICY_VALUE_EMBED_NEVER = 2;
+ public static final int PROFILE_EMBED_POLICY_VALUE_NO_RESTRICTIONS = 3;
+
+ // FIXME: ascii or byte
+ public static final TagInfoAscii EXIF_TAG_PROFILE_COPYRIGHT = new TagInfoAscii(
+ "Profile Copyright", 0xc6fe, -1,
+ TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
+
+ public static final TagInfoSRational EXIF_TAG_FORWARD_MATRIX1 = new TagInfoSRational(
+ "Forward Matrix 1", 0xc714, -1,
+ TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
+
+ public static final TagInfoSRational EXIF_TAG_FORWARD_MATRIX2 = new TagInfoSRational(
+ "Forward Matrix 2", 0xc715, -1,
+ TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
+
+ // FIXME: ascii or byte
+ public static final TagInfoAscii EXIF_TAG_PREVIEW_APPLICATION_NAME = new TagInfoAscii(
+ "Preview Application Name", 0xc716, -1,
+ TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
+
+ // FIXME: ascii or byte
+ public static final TagInfoAscii EXIF_TAG_PREVIEW_APPLICATION_VERSION = new TagInfoAscii(
+ "Preview Application Version", 0xc717, -1,
+ TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
+
+ // FIXME: ascii or byte
+ public static final TagInfoAscii EXIF_TAG_PREVIEW_SETTINGS_NAME = new TagInfoAscii(
+ "Preview Settings Name", 0xc718, -1,
+ TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
+
+ public static final TagInfoByte EXIF_TAG_PREVIEW_SETTINGS_DIGEST = new TagInfoByte(
+ "Preview Settings Digest", 0xc719, 16,
+ TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
+
+ public static final TagInfoLong EXIF_TAG_PREVIEW_COLORSPACE = new TagInfoLong(
+ "Preview Colorspace", 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;
+ public static final int PREVIEW_COLORSPACE_VALUE_sRGB = 2;
+ public static final int PREVIEW_COLORSPACE_VALUE_ADOBE_RGB = 3;
+ 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,
+ TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
+
+ public static final TagInfoByte EXIF_TAG_RAW_IMAGE_DIGEST = new TagInfoByte(
+ "Raw Image Digest", 0xc71c, 16,
+ TiffDirectoryType.EXIF_DIRECTORY_IFD0);
+
+ public static final TagInfoByte EXIF_TAG_ORIGINAL_RAW_FILE_DIGEST = new TagInfoByte(
+ "Original Raw File Digest", 0xc71d, 16,
+ TiffDirectoryType.EXIF_DIRECTORY_IFD0);
+
+ public static final TagInfoShortOrLong EXIF_TAG_SUB_TILE_BLOCK_SIZE = new TagInfoShortOrLong(
+ "Sub Tile Block Size", 0xc71e, 2,
+ TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
+
+ public static final TagInfoShortOrLong EXIF_TAG_ROW_INTERLEAVE_FACTOR = new TagInfoShortOrLong(
+ "Row Interleave Factor", 0xc71f, 1,
+ TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
+
+ public static final TagInfoLong EXIF_TAG_PROFILE_LOOK_TABLE_DIMS = new TagInfoLong(
+ "Profile Look Table Dims", 0xc725, 3,
+ TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
+
+ public static final TagInfoFloat EXIF_TAG_PROFILE_LOOK_TABLE_DATA = new TagInfoFloat(
+ "Profile Look Table Data", 0xc726, -1,
+ TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
+
+ public static final TagInfoUndefined EXIF_TAG_OPCODE_LIST_1 = new TagInfoUndefined(
+ "Opcode List 1", 0xc740, -1,
+ TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
+
+ public static final TagInfoUndefined EXIF_TAG_OPCODE_LIST_2 = new TagInfoUndefined(
+ "Opcode List 2", 0xc741, -1,
+ TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
+
+ public static final TagInfoUndefined EXIF_TAG_OPCODE_LIST_3 = new TagInfoUndefined(
+ "Opcode List 3", 0xc74E, -1,
+ TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
+
+ public static final TagInfoDouble EXIF_TAG_NOISE_PROFILE = new TagInfoDouble(
+ "Noise Profile", 0xc761, -1,
+ TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
+
+ public static final List<TagInfo> ALL_DNG_TAGS =
+ Collections.unmodifiableList(Arrays.asList(
+ EXIF_TAG_DNG_VERSION,
+ EXIF_TAG_DNG_BACKWARD_VERSION,
+ EXIF_TAG_UNIQUE_CAMERA_MODEL,
+ EXIF_TAG_LOCALIZED_CAMERA_MODEL,
+ EXIF_TAG_CFAPLANE_COLOR,
+ EXIF_TAG_CFALAYOUT,
+ EXIF_TAG_LINEARIZATION_TABLE,
+ EXIF_TAG_BLACK_LEVEL_REPEAT_DIM,
+ EXIF_TAG_BLACK_LEVEL,
+ EXIF_TAG_BLACK_LEVEL_DELTA_H,
+ EXIF_TAG_BLACK_LEVEL_DELTA_V,
+ EXIF_TAG_WHITE_LEVEL,
+ EXIF_TAG_DEFAULT_SCALE,
+ EXIF_TAG_DEFAULT_CROP_ORIGIN,
+ EXIF_TAG_DEFAULT_CROP_SIZE,
+ EXIF_TAG_COLOR_MATRIX_1,
+ EXIF_TAG_COLOR_MATRIX_2,
+ EXIF_TAG_CAMERA_CALIBRATION_1,
+ EXIF_TAG_CAMERA_CALIBRATION_2,
+ EXIF_TAG_REDUCTION_MATRIX_1,
+ EXIF_TAG_REDUCTION_MATRIX_2,
+ EXIF_TAG_ANALOG_BALANCE,
+ EXIF_TAG_AS_SHOT_NEUTRAL,
+ EXIF_TAG_AS_SHOT_WHITE_XY,
+ EXIF_TAG_BASELINE_EXPOSURE,
+ EXIF_TAG_BASELINE_NOISE,
+ EXIF_TAG_BASELINE_SHARPNESS,
+ EXIF_TAG_BAYER_GREEN_SPLIT,
+ EXIF_TAG_LINEAR_RESPONSE_LIMIT,
+ EXIF_TAG_CAMERA_SERIAL_NUMBER,
+ EXIF_TAG_DNG_LENS_INFO,
+ EXIF_TAG_CHROMA_BLUR_RADIUS,
+ EXIF_TAG_ANTI_ALIAS_STRENGTH,
+ EXIF_TAG_SHADOW_SCALE,
+ EXIF_TAG_DNG_PRIVATE_DATA,
+ EXIF_TAG_MAKER_NOTE_SAFETY,
+ EXIF_TAG_CALIBRATION_ILLUMINANT_1,
+ EXIF_TAG_CALIBRATION_ILLUMINANT_2,
+ EXIF_TAG_BEST_QUALITY_SCALE,
+ EXIF_TAG_RAW_DATA_UNIQUE_ID,
+ EXIF_TAG_ORIGINAL_RAW_FILE_NAME,
+ EXIF_TAG_ORIGINAL_RAW_FILE_DATA,
+ EXIF_TAG_ACTIVE_AREA,
+ EXIF_TAG_MASKED_AREAS,
+ EXIF_TAG_AS_SHOT_ICCPROFILE,
+ EXIF_TAG_AS_SHOT_PRE_PROFILE_MATRIX,
+ EXIF_TAG_CURRENT_ICCPROFILE,
+ EXIF_TAG_CURRENT_PRE_PROFILE_MATRIX,
+ EXIF_TAG_COLORIMETRIC_REFERENCE,
+ EXIF_TAG_CAMERA_CALIBRATION_SIGNATURE,
+ EXIF_TAG_PROFILE_CALIBRATION_SIGNATURE,
+ EXIF_TAG_EXTRA_CAMERA_PROFILES,
+ EXIF_TAG_AS_SHOT_PROFILE_NAME,
+ EXIF_TAG_NOISE_REDUCTION_APPLIED,
+ EXIF_TAG_PROFILE_NAME,
+ EXIF_TAG_PROFILE_HUE_SAT_MAP_DIMS,
+ EXIF_TAG_PROFILE_HUE_SAT_MAP_DATA1,
+ EXIF_TAG_PROFILE_HUE_SAT_MAP_DATA2,
+ EXIF_TAG_PROFILE_TONE_CURVE,
+ EXIF_TAG_PROFILE_EMBED_POLICY,
+ EXIF_TAG_PROFILE_COPYRIGHT,
+ EXIF_TAG_FORWARD_MATRIX1,
+ EXIF_TAG_FORWARD_MATRIX2,
+ EXIF_TAG_PREVIEW_APPLICATION_NAME,
+ EXIF_TAG_PREVIEW_APPLICATION_VERSION,
+ EXIF_TAG_PREVIEW_SETTINGS_NAME,
+ EXIF_TAG_PREVIEW_SETTINGS_DIGEST,
+ EXIF_TAG_PREVIEW_COLORSPACE,
+ EXIF_TAG_PREVIEW_DATE_TIME,
+ EXIF_TAG_RAW_IMAGE_DIGEST,
+ EXIF_TAG_ORIGINAL_RAW_FILE_DIGEST,
+ EXIF_TAG_SUB_TILE_BLOCK_SIZE,
+ EXIF_TAG_ROW_INTERLEAVE_FACTOR,
+ EXIF_TAG_PROFILE_LOOK_TABLE_DIMS,
+ EXIF_TAG_PROFILE_LOOK_TABLE_DATA,
+ EXIF_TAG_OPCODE_LIST_1,
+ EXIF_TAG_OPCODE_LIST_2,
+ EXIF_TAG_OPCODE_LIST_3,
+ EXIF_TAG_NOISE_PROFILE));
+}
Propchange: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/DngTagConstants.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/ExifTagConstants.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/ExifTagConstants.java?rev=1304986&r1=1304985&r2=1304986&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/ExifTagConstants.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/ExifTagConstants.java Sun Mar 25 06:56:43 2012
@@ -50,7 +50,6 @@ import org.apache.commons.sanselan.forma
* 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
- * Alias Sketchbook Pro multi-layer TIFF: http://www.awaresystems.be/imaging/tiff/tifftags/docs/alias.html
*/
public interface ExifTagConstants
extends
@@ -519,202 +518,12 @@ public interface ExifTagConstants
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_VERSION = new TagInfoByte(
- "DNG Version", 0xc612, 4, TiffDirectoryType.EXIF_DIRECTORY_IFD0);
- public static final TagInfoByte EXIF_TAG_DNG_BACKWARD_VERSION = new TagInfoByte(
- "DNG Backward Version", 0xc613, 4,
- TiffDirectoryType.EXIF_DIRECTORY_IFD0);
- public static final TagInfoAscii EXIF_TAG_UNIQUE_CAMERA_MODEL = new TagInfoAscii(
- "Unique Camera Model", 0xc614, 1,
- TiffDirectoryType.EXIF_DIRECTORY_IFD0);
- public static final TagInfoAscii EXIF_TAG_LOCALIZED_CAMERA_MODEL = new TagInfoAscii(
- "Localized Camera Model", 0xc615, 1,
- TiffDirectoryType.EXIF_DIRECTORY_IFD0);
- public static final TagInfoByte EXIF_TAG_CFAPLANE_COLOR = new TagInfoByte(
- "CFAPlane Color", 0xc616, -1,
- TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
- public static final TagInfoShort EXIF_TAG_CFALAYOUT = new TagInfoShort("CFALayout",
- 0xc617, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
- public static final int CFALAYOUT_VALUE_RECTANGULAR = 1;
- public static final int CFALAYOUT_VALUE_EVEN_COLUMNS_OFFSET_DOWN_1_2_ROW = 2;
- public static final int CFALAYOUT_VALUE_EVEN_COLUMNS_OFFSET_UP_1_2_ROW = 3;
- public static final int CFALAYOUT_VALUE_EVEN_ROWS_OFFSET_RIGHT_1_2_COLUMN = 4;
- public static final int CFALAYOUT_VALUE_EVEN_ROWS_OFFSET_LEFT_1_2_COLUMN = 5;
- public static final TagInfoShort EXIF_TAG_LINEARIZATION_TABLE = new TagInfoShort(
- "Linearization Table", 0xc618, -1,
- TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
- public static final TagInfoShort EXIF_TAG_BLACK_LEVEL_REPEAT_DIM = new TagInfoShort(
- "Black Level Repeat Dim", 0xc619,
- 2, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
- public static final TagInfoShortOrLongOrRational EXIF_TAG_BLACK_LEVEL = new TagInfoShortOrLongOrRational(
- "Black Level", 0xc61a, -1,
- TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
- public static final TagInfoSRational EXIF_TAG_BLACK_LEVEL_DELTA_H = new TagInfoSRational(
- "Black Level Delta H", 0xc61b, -1,
- TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
- public static final TagInfoSRational EXIF_TAG_BLACK_LEVEL_DELTA_V = new TagInfoSRational(
- "Black Level Delta V", 0xc61c, -1,
- TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
- public static final TagInfoShortOrLong EXIF_TAG_WHITE_LEVEL = new TagInfoShortOrLong(
- "White Level", 0xc61d, -1,
- TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
- public static final TagInfoRational EXIF_TAG_DEFAULT_SCALE = new TagInfoRational(
- "Default Scale", 0xc61e, 2,
- TiffDirectoryType.EXIF_DIRECTORY_SUB_IFD);
- public static final TagInfoShortOrLongOrRational EXIF_TAG_DEFAULT_CROP_ORIGIN = new TagInfoShortOrLongOrRational(
- "Default Crop Origin", 0xc61f, 2,
- TiffDirectoryType.EXIF_DIRECTORY_SUB_IFD);
- public static final TagInfoShortOrLongOrRational EXIF_TAG_DEFAULT_CROP_SIZE = new TagInfoShortOrLongOrRational(
- "Default Crop Size", 0xc620, 2,
- TiffDirectoryType.EXIF_DIRECTORY_SUB_IFD);
- public static final TagInfoSRational EXIF_TAG_COLOR_MATRIX_1 = new TagInfoSRational(
- "Color Matrix 1", 0xc621, -1,
- TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
- public static final TagInfoSRational EXIF_TAG_COLOR_MATRIX_2 = new TagInfoSRational(
- "Color Matrix 2", 0xc622, -1,
- TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
- public static final TagInfoSRational EXIF_TAG_CAMERA_CALIBRATION_1 = new TagInfoSRational(
- "Camera Calibration 1", 0xc623, -1,
- TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
- public static final TagInfoSRational EXIF_TAG_CAMERA_CALIBRATION_2 = new TagInfoSRational(
- "Camera Calibration 2", 0xc624, -1,
- TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
- public static final TagInfoSRational EXIF_TAG_REDUCTION_MATRIX_1 = new TagInfoSRational(
- "Reduction Matrix 1", 0xc625, -1,
- TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
- public static final TagInfoSRational EXIF_TAG_REDUCTION_MATRIX_2 = new TagInfoSRational(
- "Reduction Matrix 2", 0xc626, -1,
- TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
- public static final TagInfoRational EXIF_TAG_ANALOG_BALANCE = new TagInfoRational(
- "Analog Balance", 0xc627, -1,
- TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
- public static final TagInfoShortOrRational EXIF_TAG_AS_SHOT_NEUTRAL = new TagInfoShortOrRational(
- "As Shot Neutral", 0xc628, -1,
- TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
- public static final TagInfoRational EXIF_TAG_AS_SHOT_WHITE_XY = new TagInfoRational(
- "As Shot White XY", 0xc629, 2,
- TiffDirectoryType.EXIF_DIRECTORY_IFD0);
- public static final TagInfoSRational EXIF_TAG_BASELINE_EXPOSURE = new TagInfoSRational(
- "Baseline Exposure", 0xc62a, 1,
- TiffDirectoryType.EXIF_DIRECTORY_IFD0);
- public static final TagInfoRational EXIF_TAG_BASELINE_NOISE = new TagInfoRational(
- "Baseline Noise", 0xc62b, 1,
- TiffDirectoryType.EXIF_DIRECTORY_IFD0);
- public static final TagInfoRational EXIF_TAG_BASELINE_SHARPNESS = new TagInfoRational(
- "Baseline Sharpness", 0xc62c, 1,
- TiffDirectoryType.EXIF_DIRECTORY_IFD0);
- public static final TagInfoLong EXIF_TAG_BAYER_GREEN_SPLIT = new TagInfoLong(
- "Bayer Green Split", 0xc62d, 1,
- TiffDirectoryType.EXIF_DIRECTORY_SUB_IFD);
- public static final TagInfoRational EXIF_TAG_LINEAR_RESPONSE_LIMIT = new TagInfoRational(
- "Linear Response Limit", 0xc62e, 1,
- TiffDirectoryType.EXIF_DIRECTORY_IFD0);
- public static final TagInfoAscii EXIF_TAG_CAMERA_SERIAL_NUMBER = new TagInfoAscii(
- "Camera Serial Number", 0xc62f, 1,
- TiffDirectoryType.EXIF_DIRECTORY_IFD0);
- public static final TagInfoRational EXIF_TAG_DNG_LENS_INFO = new TagInfoRational(
- "DNG Lens Info", 0xc630, 4,
- TiffDirectoryType.EXIF_DIRECTORY_IFD0);
- public static final TagInfoRational EXIF_TAG_CHROMA_BLUR_RADIUS = new TagInfoRational(
- "Chroma Blur Radius", 0xc631, 1,
- TiffDirectoryType.EXIF_DIRECTORY_SUB_IFD);
- public static final TagInfoRational EXIF_TAG_ANTI_ALIAS_STRENGTH = new TagInfoRational(
- "Anti Alias Strength", 0xc632, 1,
- TiffDirectoryType.EXIF_DIRECTORY_SUB_IFD);
- public static final TagInfoRational EXIF_TAG_SHADOW_SCALE = new TagInfoRational(
- "Shadow Scale", 0xc633, 1, TiffDirectoryType.EXIF_DIRECTORY_IFD0);
- // poly tag public static final TagInfo2 EXIF_TAG_SR2PRIVATE = new TagInfo2( "SR2Private", 0xc634, , 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
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 TagInfoByte EXIF_TAG_DNG_PRIVATE_DATA = new TagInfoByte(
- "DNG Private Data", 0xc634, -1,
- TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
- public static final TagInfoShort EXIF_TAG_MAKER_NOTE_SAFETY = new TagInfoShort(
- "Maker Note Safety", 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,
- TiffDirectoryType.EXIF_DIRECTORY_IFD0);
- public static final int CALIBRATION_ILLUMINANT_1_VALUE_DAYLIGHT = 1;
- public static final int CALIBRATION_ILLUMINANT_1_VALUE_FLUORESCENT = 2;
- public static final int CALIBRATION_ILLUMINANT_1_VALUE_TUNGSTEN = 3;
- public static final int CALIBRATION_ILLUMINANT_1_VALUE_FLASH = 4;
- public static final int CALIBRATION_ILLUMINANT_1_VALUE_FINE_WEATHER = 9;
- public static final int CALIBRATION_ILLUMINANT_1_VALUE_CLOUDY = 10;
- public static final int CALIBRATION_ILLUMINANT_1_VALUE_SHADE = 11;
- public static final int CALIBRATION_ILLUMINANT_1_VALUE_DAYLIGHT_FLUORESCENT = 12;
- public static final int CALIBRATION_ILLUMINANT_1_VALUE_DAY_WHITE_FLUORESCENT = 13;
- public static final int CALIBRATION_ILLUMINANT_1_VALUE_COOL_WHITE_FLUORESCENT = 14;
- public static final int CALIBRATION_ILLUMINANT_1_VALUE_WHITE_FLUORESCENT = 15;
- public static final int CALIBRATION_ILLUMINANT_1_VALUE_STANDARD_LIGHT_A = 17;
- public static final int CALIBRATION_ILLUMINANT_1_VALUE_STANDARD_LIGHT_B = 18;
- public static final int CALIBRATION_ILLUMINANT_1_VALUE_STANDARD_LIGHT_C = 19;
- public static final int CALIBRATION_ILLUMINANT_1_VALUE_D55 = 20;
- public static final int CALIBRATION_ILLUMINANT_1_VALUE_D65 = 21;
- public static final int CALIBRATION_ILLUMINANT_1_VALUE_D75 = 22;
- public static final int CALIBRATION_ILLUMINANT_1_VALUE_D50 = 23;
- public static final int CALIBRATION_ILLUMINANT_1_VALUE_ISO_STUDIO_TUNGSTEN = 24;
- 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,
- TiffDirectoryType.EXIF_DIRECTORY_IFD0);
- public static final int CALIBRATION_ILLUMINANT_2_VALUE_DAYLIGHT = 1;
- public static final int CALIBRATION_ILLUMINANT_2_VALUE_FLUORESCENT = 2;
- public static final int CALIBRATION_ILLUMINANT_2_VALUE_TUNGSTEN = 3;
- public static final int CALIBRATION_ILLUMINANT_2_VALUE_FLASH = 4;
- public static final int CALIBRATION_ILLUMINANT_2_VALUE_FINE_WEATHER = 9;
- public static final int CALIBRATION_ILLUMINANT_2_VALUE_CLOUDY = 10;
- public static final int CALIBRATION_ILLUMINANT_2_VALUE_SHADE = 11;
- public static final int CALIBRATION_ILLUMINANT_2_VALUE_DAYLIGHT_FLUORESCENT = 12;
- public static final int CALIBRATION_ILLUMINANT_2_VALUE_DAY_WHITE_FLUORESCENT = 13;
- public static final int CALIBRATION_ILLUMINANT_2_VALUE_COOL_WHITE_FLUORESCENT = 14;
- public static final int CALIBRATION_ILLUMINANT_2_VALUE_WHITE_FLUORESCENT = 15;
- public static final int CALIBRATION_ILLUMINANT_2_VALUE_STANDARD_LIGHT_A = 17;
- public static final int CALIBRATION_ILLUMINANT_2_VALUE_STANDARD_LIGHT_B = 18;
- public static final int CALIBRATION_ILLUMINANT_2_VALUE_STANDARD_LIGHT_C = 19;
- public static final int CALIBRATION_ILLUMINANT_2_VALUE_D55 = 20;
- public static final int CALIBRATION_ILLUMINANT_2_VALUE_D65 = 21;
- public static final int CALIBRATION_ILLUMINANT_2_VALUE_D75 = 22;
- public static final int CALIBRATION_ILLUMINANT_2_VALUE_D50 = 23;
- public static final int CALIBRATION_ILLUMINANT_2_VALUE_ISO_STUDIO_TUNGSTEN = 24;
- 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,
- TiffDirectoryType.EXIF_DIRECTORY_SUB_IFD);
- public static final TagInfoByte EXIF_TAG_RAW_DATA_UNIQUE_ID = new TagInfoByte(
- "Raw Data Unique ID", 0xc65d, 16,
- TiffDirectoryType.EXIF_DIRECTORY_IFD0);
- public static final TagInfoByte EXIF_TAG_ALIAS_LAYER_METADATA = new TagInfoByte(
- "Alias Layer Metadata", 0xc660, -1,
- TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
- public static final TagInfoAscii EXIF_TAG_ORIGINAL_RAW_FILE_NAME = new TagInfoAscii(
- "Original Raw File Name", 0xc68b, 1,
- TiffDirectoryType.EXIF_DIRECTORY_IFD0);
- public static final TagInfoUndefined EXIF_TAG_ORIGINAL_RAW_FILE_DATA = new TagInfoUndefined(
- "Original Raw File Data", 0xc68c, 1,
- TiffDirectoryType.EXIF_DIRECTORY_IFD0);
- public static final TagInfoLong EXIF_TAG_ACTIVE_AREA = new TagInfoLong(
- "Active Area", 0xc68d, 4, TiffDirectoryType.EXIF_DIRECTORY_SUB_IFD);
- public static final TagInfoLong EXIF_TAG_MASKED_AREAS = new TagInfoLong(
- "Masked Areas", 0xc68e, 4, TiffDirectoryType.EXIF_DIRECTORY_SUB_IFD);
- public static final TagInfoByte EXIF_TAG_AS_SHOT_ICCPROFILE = new TagInfoByte(
- "As Shot ICCProfile", 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, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
- public static final TagInfoUndefined EXIF_TAG_CURRENT_ICCPROFILE = new TagInfoUndefined(
- "Current ICCProfile", 0xc691, -1,
- TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
- public static final TagInfoSRational EXIF_TAG_CURRENT_PRE_PROFILE_MATRIX = new TagInfoSRational(
- "Current Pre Profile Matrix", 0xc692,
- -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
public static final TagInfoSLong EXIF_TAG_OFFSET_SCHEMA = new TagInfoSLong(
"Offset Schema", 0xea1d, 1,
TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD);
@@ -822,32 +631,7 @@ public interface ExifTagConstants
EXIF_TAG_OCE_SCANJOB_DESC,
EXIF_TAG_OCE_APPLICATION_SELECTOR, EXIF_TAG_OCE_IDNUMBER,
EXIF_TAG_OCE_IMAGE_LOGIC, EXIF_TAG_ANNOTATIONS, EXIF_TAG_PRINT_IM,
- EXIF_TAG_DNG_VERSION, EXIF_TAG_DNG_BACKWARD_VERSION,
- EXIF_TAG_UNIQUE_CAMERA_MODEL, EXIF_TAG_LOCALIZED_CAMERA_MODEL,
- EXIF_TAG_CFAPLANE_COLOR, EXIF_TAG_CFALAYOUT,
- EXIF_TAG_LINEARIZATION_TABLE, EXIF_TAG_BLACK_LEVEL_REPEAT_DIM,
- EXIF_TAG_BLACK_LEVEL, EXIF_TAG_BLACK_LEVEL_DELTA_H,
- EXIF_TAG_BLACK_LEVEL_DELTA_V, EXIF_TAG_WHITE_LEVEL,
- EXIF_TAG_DEFAULT_SCALE, EXIF_TAG_DEFAULT_CROP_ORIGIN,
- EXIF_TAG_DEFAULT_CROP_SIZE, EXIF_TAG_COLOR_MATRIX_1,
- EXIF_TAG_COLOR_MATRIX_2, EXIF_TAG_CAMERA_CALIBRATION_1,
- EXIF_TAG_CAMERA_CALIBRATION_2, EXIF_TAG_REDUCTION_MATRIX_1,
- EXIF_TAG_REDUCTION_MATRIX_2, EXIF_TAG_ANALOG_BALANCE,
- EXIF_TAG_AS_SHOT_NEUTRAL, EXIF_TAG_AS_SHOT_WHITE_XY,
- EXIF_TAG_BASELINE_EXPOSURE, EXIF_TAG_BASELINE_NOISE,
- EXIF_TAG_BASELINE_SHARPNESS, EXIF_TAG_BAYER_GREEN_SPLIT,
- EXIF_TAG_LINEAR_RESPONSE_LIMIT, EXIF_TAG_CAMERA_SERIAL_NUMBER,
- EXIF_TAG_DNG_LENS_INFO, EXIF_TAG_CHROMA_BLUR_RADIUS,
- EXIF_TAG_ANTI_ALIAS_STRENGTH, EXIF_TAG_SHADOW_SCALE,
EXIF_TAG_DNG_ADOBE_DATA, EXIF_TAG_DNG_PENTAX_DATA,
- EXIF_TAG_DNG_PRIVATE_DATA, EXIF_TAG_MAKER_NOTE_SAFETY,
- EXIF_TAG_CALIBRATION_ILLUMINANT_1,
- EXIF_TAG_CALIBRATION_ILLUMINANT_2, EXIF_TAG_BEST_QUALITY_SCALE,
- EXIF_TAG_RAW_DATA_UNIQUE_ID, EXIF_TAG_ALIAS_LAYER_METADATA,
- EXIF_TAG_ORIGINAL_RAW_FILE_NAME, EXIF_TAG_ORIGINAL_RAW_FILE_DATA,
- EXIF_TAG_ACTIVE_AREA, EXIF_TAG_MASKED_AREAS,
- EXIF_TAG_AS_SHOT_ICCPROFILE, EXIF_TAG_AS_SHOT_PRE_PROFILE_MATRIX,
- EXIF_TAG_CURRENT_ICCPROFILE, EXIF_TAG_CURRENT_PRE_PROFILE_MATRIX,
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/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/tiff/TiffTagIntegrityTest.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/tiff/TiffTagIntegrityTest.java?rev=1304986&r1=1304985&r2=1304986&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/tiff/TiffTagIntegrityTest.java (original)
+++ commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/tiff/TiffTagIntegrityTest.java Sun Mar 25 06:56:43 2012
@@ -22,7 +22,9 @@ import java.util.List;
import org.apache.commons.sanselan.SanselanTest;
import org.apache.commons.sanselan.formats.tiff.constants.AdobePageMaker6TagConstants;
import org.apache.commons.sanselan.formats.tiff.constants.AdobePhotoshopTagConstants;
+import org.apache.commons.sanselan.formats.tiff.constants.AliasSketchbookProTagConstants;
import org.apache.commons.sanselan.formats.tiff.constants.DcfTagConstants;
+import org.apache.commons.sanselan.formats.tiff.constants.DngTagConstants;
import org.apache.commons.sanselan.formats.tiff.constants.ExifTagConstants;
import org.apache.commons.sanselan.formats.tiff.constants.GpsTagConstants;
import org.apache.commons.sanselan.formats.tiff.constants.MicrosoftHdPhotoTagConstants;
@@ -39,7 +41,9 @@ public class TiffTagIntegrityTest extend
public void testTagIntegrity() {
verifyFields(AdobePageMaker6TagConstants.class, AdobePageMaker6TagConstants.ALL_ADOBE_PAGEMAKER_6_TAGS);
verifyFields(AdobePhotoshopTagConstants.class, AdobePhotoshopTagConstants.ALL_ADOBE_PHOTOSHOP_TAGS);
+ verifyFields(AliasSketchbookProTagConstants.class, AliasSketchbookProTagConstants.ALL_ALIAS_SKETCHBOOK_PRO_TAGS);
verifyFields(DcfTagConstants.class, DcfTagConstants.ALL_DCF_TAGS);
+ verifyFields(DngTagConstants.class, DngTagConstants.ALL_DNG_TAGS);
verifyFields(ExifTagConstants.class, ExifTagConstants.ALL_EXIF_TAGS);
verifyFields(GpsTagConstants.class, GpsTagConstants.ALL_GPS_TAGS);
verifyFields(MolecularDynamicsGelTagConstants.class, MolecularDynamicsGelTagConstants.ALL_MOLECULAR_DYNAMICS_GEL_TAGS);