Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/MicrosoftHdPhotoTagConstants.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/MicrosoftHdPhotoTagConstants.java?rev=1655143&r1=1655142&r2=1655143&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/MicrosoftHdPhotoTagConstants.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/MicrosoftHdPhotoTagConstants.java Tue Jan 27 20:15:19 2015 @@ -30,203 +30,204 @@ import org.apache.commons.imaging.format /** * Microsoft's HDP/WDP file format. */ -public interface MicrosoftHdPhotoTagConstants { +public final class MicrosoftHdPhotoTagConstants { + /* * The byte order for this GUID field is as follows: * Data1 (int), Data2 (short), Data3 (short) are little-endian, * Data4 (char[8]) is endian-independent. */ - TagInfoByte EXIF_TAG_PIXEL_FORMAT = new TagInfoByte( + public static final TagInfoByte EXIF_TAG_PIXEL_FORMAT = new TagInfoByte( "PixelFormat", 0xbc01, 16, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - BinaryConstant PIXEL_FORMAT_VALUE_BLACK_AND_WHITE = - TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x05); - BinaryConstant PIXEL_FORMAT_VALUE_8_BIT_GRAY = - TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x08); - BinaryConstant PIXEL_FORMAT_VALUE_16_BIT_BGR555 = - TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x9); - BinaryConstant PIXEL_FORMAT_VALUE_16_BIT_BGR565 = - TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0xa); - BinaryConstant PIXEL_FORMAT_VALUE_16_BIT_GRAY = - TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0xb); - BinaryConstant PIXEL_FORMAT_VALUE_24_BIT_BGR = - TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0xc); - BinaryConstant PIXEL_FORMAT_VALUE_24_BIT_RGB = - TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0xd); - BinaryConstant PIXEL_FORMAT_VALUE_32_BIT_BGR = - TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0xe); - BinaryConstant PIXEL_FORMAT_VALUE_32_BIT_BGRA = - TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0xf); - BinaryConstant PIXEL_FORMAT_VALUE_32_BIT_PBGRA = - TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x10); - BinaryConstant PIXEL_FORMAT_VALUE_32_BIT_GRAY_FLOAT = - TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x11); - BinaryConstant PIXEL_FORMAT_VALUE_48_BIT_RGB_FIXED_POINT = - TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x12); - BinaryConstant PIXEL_FORMAT_VALUE_32_BIT_BGR101010 = - TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x13); - BinaryConstant PIXEL_FORMAT_VALUE_48_BIT_RGB = - TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x15); - BinaryConstant PIXEL_FORMAT_VALUE_64_BIT_RGBA = - TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x16); - BinaryConstant PIXEL_FORMAT_VALUE_64_BIT_PRGBA = - TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x17); - BinaryConstant PIXEL_FORMAT_VALUE_96_BIT_RGB_FIXED_POINT = - TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x18); - BinaryConstant PIXEL_FORMAT_VALUE_128_BIT_RGBA_FLOAT = - TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x19); - BinaryConstant PIXEL_FORMAT_VALUE_128_BIT_PRGBA_FLOAT = - TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x1a); - BinaryConstant PIXEL_FORMAT_VALUE_128_BIT_RGB_FLOAT = - TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x1b); - BinaryConstant PIXEL_FORMAT_VALUE_32_BIT_CMYK = - TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x1c); - BinaryConstant PIXEL_FORMAT_VALUE_64_BIT_RGBA_FIXED_POINT = - TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x1d); - BinaryConstant PIXEL_FORMAT_VALUE_128_BIT_RGBA_FIXED_POINT = - TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x1e); - BinaryConstant PIXEL_FORMAT_VALUE_64_BIT_CMYK = - TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x1f); - BinaryConstant PIXEL_FORMAT_VALUE_24_BIT_3_CHANNELS = - TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x20); - BinaryConstant PIXEL_FORMAT_VALUE_32_BIT_4_CHANNELS = - TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x21); - BinaryConstant PIXEL_FORMAT_VALUE_40_BIT_5_CHANNELS = - TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x22); - BinaryConstant PIXEL_FORMAT_VALUE_48_BIT_6_CHANNELS = - TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x23); - BinaryConstant PIXEL_FORMAT_VALUE_56_BIT_7_CHANNELS = - TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x24); - BinaryConstant PIXEL_FORMAT_VALUE_64_BIT_8_CHANNELS = - TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x25); - BinaryConstant PIXEL_FORMAT_VALUE_48_BIT_3_CHANNELS = - TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x26); - BinaryConstant PIXEL_FORMAT_VALUE_64_BIT_4_CHANNELS = - TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x27); - BinaryConstant PIXEL_FORMAT_VALUE_80_BIT_5_CHANNELS = - TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x28); - BinaryConstant PIXEL_FORMAT_VALUE_96_BIT_6_CHANNELS = - TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x29); - BinaryConstant PIXEL_FORMAT_VALUE_112_BIT_7_CHANNELS = - TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x2a); - BinaryConstant PIXEL_FORMAT_VALUE_128_BIT_8_CHANNELS = - TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x2b); - BinaryConstant PIXEL_FORMAT_VALUE_40_BIT_CMYK_ALPHA = - TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x2c); - BinaryConstant PIXEL_FORMAT_VALUE_80_BIT_CMYK_ALPHA = - TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x2d); - BinaryConstant PIXEL_FORMAT_VALUE_32_BIT_3_CHANNELS_ALPHA = - TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x2e); - BinaryConstant PIXEL_FORMAT_VALUE_40_BIT_4_CHANNELS_ALPHA = - TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x2f); - BinaryConstant PIXEL_FORMAT_VALUE_48_BIT_5_CHANNELS_ALPHA = - TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x30); - BinaryConstant PIXEL_FORMAT_VALUE_56_BIT_6_CHANNELS_ALPHA = - TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x31); - BinaryConstant PIXEL_FORMAT_VALUE_64_BIT_7_CHANNELS_ALPHA = - TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x32); - BinaryConstant PIXEL_FORMAT_VALUE_72_BIT_8_CHANNELS_ALPHA = - TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x33); - BinaryConstant PIXEL_FORMAT_VALUE_64_BIT_3_CHANNELS_ALPHA = - TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x34); - BinaryConstant PIXEL_FORMAT_VALUE_80_BIT_4_CHANNELS_ALPHA = - TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x35); - BinaryConstant PIXEL_FORMAT_VALUE_96_BIT_5_CHANNELS_ALPHA = - TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x36); - BinaryConstant PIXEL_FORMAT_VALUE_112_BIT_6_CHANNELS_ALPHA = - TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x37); - BinaryConstant PIXEL_FORMAT_VALUE_128_BIT_7_CHANNELS_ALPHA = - TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x38); - BinaryConstant PIXEL_FORMAT_VALUE_144_BIT_8_CHANNELS_ALPHA = - TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x39); - BinaryConstant PIXEL_FORMAT_VALUE_64_BIT_RGBA_HALF = - TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x3a); - BinaryConstant PIXEL_FORMAT_VALUE_48_BIT_RGB_HALF = - TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x3b); - BinaryConstant PIXEL_FORMAT_VALUE_32_BIT_RGBE = - TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x3d); - BinaryConstant PIXEL_FORMAT_VALUE_16_BIT_GRAY_HALF = - TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x3e); - BinaryConstant PIXEL_FORMAT_VALUE_32_BIT_GRAY_FIXED_POINT = - TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte) 0x3f); + public static final BinaryConstant PIXEL_FORMAT_VALUE_BLACK_AND_WHITE = + createMicrosoftHdPhotoGuidEndingWith((byte) 0x05); + public static final BinaryConstant PIXEL_FORMAT_VALUE_8_BIT_GRAY = + createMicrosoftHdPhotoGuidEndingWith((byte) 0x08); + public static final BinaryConstant PIXEL_FORMAT_VALUE_16_BIT_BGR555 = + createMicrosoftHdPhotoGuidEndingWith((byte) 0x9); + public static final BinaryConstant PIXEL_FORMAT_VALUE_16_BIT_BGR565 = + createMicrosoftHdPhotoGuidEndingWith((byte) 0xa); + public static final BinaryConstant PIXEL_FORMAT_VALUE_16_BIT_GRAY = + createMicrosoftHdPhotoGuidEndingWith((byte) 0xb); + public static final BinaryConstant PIXEL_FORMAT_VALUE_24_BIT_BGR = + createMicrosoftHdPhotoGuidEndingWith((byte) 0xc); + public static final BinaryConstant PIXEL_FORMAT_VALUE_24_BIT_RGB = + createMicrosoftHdPhotoGuidEndingWith((byte) 0xd); + public static final BinaryConstant PIXEL_FORMAT_VALUE_32_BIT_BGR = + createMicrosoftHdPhotoGuidEndingWith((byte) 0xe); + public static final BinaryConstant PIXEL_FORMAT_VALUE_32_BIT_BGRA = + createMicrosoftHdPhotoGuidEndingWith((byte) 0xf); + public static final BinaryConstant PIXEL_FORMAT_VALUE_32_BIT_PBGRA = + createMicrosoftHdPhotoGuidEndingWith((byte) 0x10); + public static final BinaryConstant PIXEL_FORMAT_VALUE_32_BIT_GRAY_FLOAT = + createMicrosoftHdPhotoGuidEndingWith((byte) 0x11); + public static final BinaryConstant PIXEL_FORMAT_VALUE_48_BIT_RGB_FIXED_POINT = + createMicrosoftHdPhotoGuidEndingWith((byte) 0x12); + public static final BinaryConstant PIXEL_FORMAT_VALUE_32_BIT_BGR101010 = + createMicrosoftHdPhotoGuidEndingWith((byte) 0x13); + public static final BinaryConstant PIXEL_FORMAT_VALUE_48_BIT_RGB = + createMicrosoftHdPhotoGuidEndingWith((byte) 0x15); + public static final BinaryConstant PIXEL_FORMAT_VALUE_64_BIT_RGBA = + createMicrosoftHdPhotoGuidEndingWith((byte) 0x16); + public static final BinaryConstant PIXEL_FORMAT_VALUE_64_BIT_PRGBA = + createMicrosoftHdPhotoGuidEndingWith((byte) 0x17); + public static final BinaryConstant PIXEL_FORMAT_VALUE_96_BIT_RGB_FIXED_POINT = + createMicrosoftHdPhotoGuidEndingWith((byte) 0x18); + public static final BinaryConstant PIXEL_FORMAT_VALUE_128_BIT_RGBA_FLOAT = + createMicrosoftHdPhotoGuidEndingWith((byte) 0x19); + public static final BinaryConstant PIXEL_FORMAT_VALUE_128_BIT_PRGBA_FLOAT = + createMicrosoftHdPhotoGuidEndingWith((byte) 0x1a); + public static final BinaryConstant PIXEL_FORMAT_VALUE_128_BIT_RGB_FLOAT = + createMicrosoftHdPhotoGuidEndingWith((byte) 0x1b); + public static final BinaryConstant PIXEL_FORMAT_VALUE_32_BIT_CMYK = + createMicrosoftHdPhotoGuidEndingWith((byte) 0x1c); + public static final BinaryConstant PIXEL_FORMAT_VALUE_64_BIT_RGBA_FIXED_POINT = + createMicrosoftHdPhotoGuidEndingWith((byte) 0x1d); + public static final BinaryConstant PIXEL_FORMAT_VALUE_128_BIT_RGBA_FIXED_POINT = + createMicrosoftHdPhotoGuidEndingWith((byte) 0x1e); + public static final BinaryConstant PIXEL_FORMAT_VALUE_64_BIT_CMYK = + createMicrosoftHdPhotoGuidEndingWith((byte) 0x1f); + public static final BinaryConstant PIXEL_FORMAT_VALUE_24_BIT_3_CHANNELS = + createMicrosoftHdPhotoGuidEndingWith((byte) 0x20); + public static final BinaryConstant PIXEL_FORMAT_VALUE_32_BIT_4_CHANNELS = + createMicrosoftHdPhotoGuidEndingWith((byte) 0x21); + public static final BinaryConstant PIXEL_FORMAT_VALUE_40_BIT_5_CHANNELS = + createMicrosoftHdPhotoGuidEndingWith((byte) 0x22); + public static final BinaryConstant PIXEL_FORMAT_VALUE_48_BIT_6_CHANNELS = + createMicrosoftHdPhotoGuidEndingWith((byte) 0x23); + public static final BinaryConstant PIXEL_FORMAT_VALUE_56_BIT_7_CHANNELS = + createMicrosoftHdPhotoGuidEndingWith((byte) 0x24); + public static final BinaryConstant PIXEL_FORMAT_VALUE_64_BIT_8_CHANNELS = + createMicrosoftHdPhotoGuidEndingWith((byte) 0x25); + public static final BinaryConstant PIXEL_FORMAT_VALUE_48_BIT_3_CHANNELS = + createMicrosoftHdPhotoGuidEndingWith((byte) 0x26); + public static final BinaryConstant PIXEL_FORMAT_VALUE_64_BIT_4_CHANNELS = + createMicrosoftHdPhotoGuidEndingWith((byte) 0x27); + public static final BinaryConstant PIXEL_FORMAT_VALUE_80_BIT_5_CHANNELS = + createMicrosoftHdPhotoGuidEndingWith((byte) 0x28); + public static final BinaryConstant PIXEL_FORMAT_VALUE_96_BIT_6_CHANNELS = + createMicrosoftHdPhotoGuidEndingWith((byte) 0x29); + public static final BinaryConstant PIXEL_FORMAT_VALUE_112_BIT_7_CHANNELS = + createMicrosoftHdPhotoGuidEndingWith((byte) 0x2a); + public static final BinaryConstant PIXEL_FORMAT_VALUE_128_BIT_8_CHANNELS = + createMicrosoftHdPhotoGuidEndingWith((byte) 0x2b); + public static final BinaryConstant PIXEL_FORMAT_VALUE_40_BIT_CMYK_ALPHA = + createMicrosoftHdPhotoGuidEndingWith((byte) 0x2c); + public static final BinaryConstant PIXEL_FORMAT_VALUE_80_BIT_CMYK_ALPHA = + createMicrosoftHdPhotoGuidEndingWith((byte) 0x2d); + public static final BinaryConstant PIXEL_FORMAT_VALUE_32_BIT_3_CHANNELS_ALPHA = + createMicrosoftHdPhotoGuidEndingWith((byte) 0x2e); + public static final BinaryConstant PIXEL_FORMAT_VALUE_40_BIT_4_CHANNELS_ALPHA = + createMicrosoftHdPhotoGuidEndingWith((byte) 0x2f); + public static final BinaryConstant PIXEL_FORMAT_VALUE_48_BIT_5_CHANNELS_ALPHA = + createMicrosoftHdPhotoGuidEndingWith((byte) 0x30); + public static final BinaryConstant PIXEL_FORMAT_VALUE_56_BIT_6_CHANNELS_ALPHA = + createMicrosoftHdPhotoGuidEndingWith((byte) 0x31); + public static final BinaryConstant PIXEL_FORMAT_VALUE_64_BIT_7_CHANNELS_ALPHA = + createMicrosoftHdPhotoGuidEndingWith((byte) 0x32); + public static final BinaryConstant PIXEL_FORMAT_VALUE_72_BIT_8_CHANNELS_ALPHA = + createMicrosoftHdPhotoGuidEndingWith((byte) 0x33); + public static final BinaryConstant PIXEL_FORMAT_VALUE_64_BIT_3_CHANNELS_ALPHA = + createMicrosoftHdPhotoGuidEndingWith((byte) 0x34); + public static final BinaryConstant PIXEL_FORMAT_VALUE_80_BIT_4_CHANNELS_ALPHA = + createMicrosoftHdPhotoGuidEndingWith((byte) 0x35); + public static final BinaryConstant PIXEL_FORMAT_VALUE_96_BIT_5_CHANNELS_ALPHA = + createMicrosoftHdPhotoGuidEndingWith((byte) 0x36); + public static final BinaryConstant PIXEL_FORMAT_VALUE_112_BIT_6_CHANNELS_ALPHA = + createMicrosoftHdPhotoGuidEndingWith((byte) 0x37); + public static final BinaryConstant PIXEL_FORMAT_VALUE_128_BIT_7_CHANNELS_ALPHA = + createMicrosoftHdPhotoGuidEndingWith((byte) 0x38); + public static final BinaryConstant PIXEL_FORMAT_VALUE_144_BIT_8_CHANNELS_ALPHA = + createMicrosoftHdPhotoGuidEndingWith((byte) 0x39); + public static final BinaryConstant PIXEL_FORMAT_VALUE_64_BIT_RGBA_HALF = + createMicrosoftHdPhotoGuidEndingWith((byte) 0x3a); + public static final BinaryConstant PIXEL_FORMAT_VALUE_48_BIT_RGB_HALF = + createMicrosoftHdPhotoGuidEndingWith((byte) 0x3b); + public static final BinaryConstant PIXEL_FORMAT_VALUE_32_BIT_RGBE = + createMicrosoftHdPhotoGuidEndingWith((byte) 0x3d); + public static final BinaryConstant PIXEL_FORMAT_VALUE_16_BIT_GRAY_HALF = + createMicrosoftHdPhotoGuidEndingWith((byte) 0x3e); + public static final BinaryConstant PIXEL_FORMAT_VALUE_32_BIT_GRAY_FIXED_POINT = + createMicrosoftHdPhotoGuidEndingWith((byte) 0x3f); - TagInfoLong EXIF_TAG_TRANSFOMATION = new TagInfoLong( + public static final TagInfoLong EXIF_TAG_TRANSFOMATION = new TagInfoLong( "Transfomation", 0xbc02, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - int TRANSFOMATION_VALUE_HORIZONTAL_NORMAL = 0; - int TRANSFOMATION_VALUE_MIRROR_VERTICAL = 1; - int TRANSFOMATION_VALUE_MIRROR_HORIZONTAL = 2; - int TRANSFOMATION_VALUE_ROTATE_180 = 3; - int TRANSFOMATION_VALUE_ROTATE_90_CW = 4; - int TRANSFOMATION_VALUE_MIRROR_HORIZONTAL_AND_ROTATE_90_CW = 5; - int TRANSFOMATION_VALUE_MIRROR_HORIZONTAL_AND_ROTATE_270_CW = 6; - int TRANSFOMATION_VALUE_ROTATE_270_CW = 7; + public static final int TRANSFOMATION_VALUE_HORIZONTAL_NORMAL = 0; + public static final int TRANSFOMATION_VALUE_MIRROR_VERTICAL = 1; + public static final int TRANSFOMATION_VALUE_MIRROR_HORIZONTAL = 2; + public static final int TRANSFOMATION_VALUE_ROTATE_180 = 3; + public static final int TRANSFOMATION_VALUE_ROTATE_90_CW = 4; + public static final int TRANSFOMATION_VALUE_MIRROR_HORIZONTAL_AND_ROTATE_90_CW = 5; + public static final int TRANSFOMATION_VALUE_MIRROR_HORIZONTAL_AND_ROTATE_270_CW = 6; + public static final int TRANSFOMATION_VALUE_ROTATE_270_CW = 7; - TagInfoLong EXIF_TAG_UNCOMPRESSED = new TagInfoLong( + public static final TagInfoLong EXIF_TAG_UNCOMPRESSED = new TagInfoLong( "Uncompressed", 0xbc03, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - int UNCOMPRESSED_VALUE_NO = 0; - int UNCOMPRESSED_VALUE_YES = 1; + public static final int UNCOMPRESSED_VALUE_NO = 0; + public static final int UNCOMPRESSED_VALUE_YES = 1; - TagInfoLong EXIF_TAG_IMAGE_TYPE = new TagInfoLong( + public static final TagInfoLong EXIF_TAG_IMAGE_TYPE = new TagInfoLong( "ImageType", 0xbc04, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoLong EXIF_TAG_IMAGE_WIDTH = new TagInfoLong( + public static final TagInfoLong EXIF_TAG_IMAGE_WIDTH = new TagInfoLong( "ImageWidth", 0xbc80, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoLong EXIF_TAG_IMAGE_HEIGHT = new TagInfoLong( + public static final TagInfoLong EXIF_TAG_IMAGE_HEIGHT = new TagInfoLong( "ImageHeight", 0xbc81, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoFloat EXIF_TAG_WIDTH_RESOLUTION = new TagInfoFloat( + public static final TagInfoFloat EXIF_TAG_WIDTH_RESOLUTION = new TagInfoFloat( "WidthResolution", 0xbc82, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoFloat EXIF_TAG_HEIGHT_RESOLUTION = new TagInfoFloat( + public static final TagInfoFloat EXIF_TAG_HEIGHT_RESOLUTION = new TagInfoFloat( "HeightResolution", 0xbc83, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); // FIXME: might be an offset? - TagInfoLong EXIF_TAG_IMAGE_OFFSET = new TagInfoLong( + public static final TagInfoLong EXIF_TAG_IMAGE_OFFSET = new TagInfoLong( "ImageOffset", 0xbcc0, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoLong EXIF_TAG_IMAGE_BYTE_COUNT = new TagInfoLong( + public static final TagInfoLong EXIF_TAG_IMAGE_BYTE_COUNT = new TagInfoLong( "ImageByteCount", 0xbcc1, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); // FIXME: might be an offset? - TagInfoLong EXIF_TAG_ALPHA_OFFSET = new TagInfoLong( + public static final TagInfoLong EXIF_TAG_ALPHA_OFFSET = new TagInfoLong( "AlphaOffset", 0xbcc2, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoLong EXIF_TAG_ALPHA_BYTE_COUNT = new TagInfoLong( + public static final TagInfoLong EXIF_TAG_ALPHA_BYTE_COUNT = new TagInfoLong( "AlphaByteCount", 0xbcc3, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoByte EXIF_TAG_IMAGE_DATA_DISCARD = new TagInfoByte( + public static final TagInfoByte EXIF_TAG_IMAGE_DATA_DISCARD = new TagInfoByte( "ImageDataDiscard", 0xbcc4, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - int IMAGE_DATA_DISCARD_VALUE_FULL_RESOLUTION = 0; - int IMAGE_DATA_DISCARD_VALUE_FLEXBITS_DISCARDED = 1; - int IMAGE_DATA_DISCARD_VALUE_HIGH_PASS_FREQUENCY_DATA_DISCARDED = 2; - int IMAGE_DATA_DISCARD_VALUE_HIGHPASS_AND_LOW_PASS_FREQUENCY_DATA_DISCARDED = 3; + public static final int IMAGE_DATA_DISCARD_VALUE_FULL_RESOLUTION = 0; + public static final int IMAGE_DATA_DISCARD_VALUE_FLEXBITS_DISCARDED = 1; + public static final int IMAGE_DATA_DISCARD_VALUE_HIGH_PASS_FREQUENCY_DATA_DISCARDED = 2; + public static final int IMAGE_DATA_DISCARD_VALUE_HIGHPASS_AND_LOW_PASS_FREQUENCY_DATA_DISCARDED = 3; - TagInfoByte EXIF_TAG_ALPHA_DATA_DISCARD = new TagInfoByte( + public static final TagInfoByte EXIF_TAG_ALPHA_DATA_DISCARD = new TagInfoByte( "AlphaDataDiscard", 0xbcc5, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - int ALPHA_DATA_DISCARD_VALUE_FULL_RESOLUTION = 0; - int ALPHA_DATA_DISCARD_VALUE_FLEXBITS_DISCARDED = 1; - int ALPHA_DATA_DISCARD_VALUE_HIGH_PASS_FREQUENCY_DATA_DISCARDED = 2; - int ALPHA_DATA_DISCARD_VALUE_HIGHPASS_AND_LOW_PASS_FREQUENCY_DATA_DISCARDED = 3; + public static final int ALPHA_DATA_DISCARD_VALUE_FULL_RESOLUTION = 0; + public static final int ALPHA_DATA_DISCARD_VALUE_FLEXBITS_DISCARDED = 1; + public static final int ALPHA_DATA_DISCARD_VALUE_HIGH_PASS_FREQUENCY_DATA_DISCARDED = 2; + public static final int ALPHA_DATA_DISCARD_VALUE_HIGHPASS_AND_LOW_PASS_FREQUENCY_DATA_DISCARDED = 3; - TagInfoUndefined EXIF_TAG_PADDING = new TagInfoUndefined( + public static final TagInfoUndefined EXIF_TAG_PADDING = new TagInfoUndefined( "Padding", 0xea1c, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - List<TagInfo> ALL_MICROSOFT_HD_PHOTO_TAGS = + public static final List<TagInfo> ALL_MICROSOFT_HD_PHOTO_TAGS = Collections.unmodifiableList(Arrays.asList( EXIF_TAG_PIXEL_FORMAT, EXIF_TAG_TRANSFOMATION, @@ -243,4 +244,15 @@ public interface MicrosoftHdPhotoTagCons EXIF_TAG_IMAGE_DATA_DISCARD, EXIF_TAG_ALPHA_DATA_DISCARD, EXIF_TAG_PADDING)); + + private static BinaryConstant createMicrosoftHdPhotoGuidEndingWith(final byte end) { + return new BinaryConstant(new byte[] { (byte) 0x24, (byte) 0xC3, + (byte) 0xDD, (byte) 0x6F, (byte) 0x03, (byte) 0x4E, + (byte) 0xFE, (byte) 0x4B, (byte) 0xB1, (byte) 0x85, + (byte) 0x3D, (byte) 0x77, (byte) 0x76, (byte) 0x8D, + (byte) 0xC9, end }); + } + + private MicrosoftHdPhotoTagConstants() { + } }
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/MicrosoftTagConstants.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/MicrosoftTagConstants.java?rev=1655143&r1=1655142&r2=1655143&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/MicrosoftTagConstants.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/MicrosoftTagConstants.java Tue Jan 27 20:15:19 2015 @@ -27,36 +27,37 @@ import org.apache.commons.imaging.format /** * Largely undocumented and derived by experimentation. */ -public interface MicrosoftTagConstants { - TagInfoShort EXIF_TAG_RATING = new TagInfoShort( +public final class MicrosoftTagConstants { + + public static final TagInfoShort EXIF_TAG_RATING = new TagInfoShort( "Rating", 0x4746, 1, TiffDirectoryType.EXIF_DIRECTORY_IFD0); - - TagInfoShort EXIF_TAG_RATING_PERCENT = new TagInfoShort( + + public static final TagInfoShort EXIF_TAG_RATING_PERCENT = new TagInfoShort( "RatingPercent", 0x4749, 1, TiffDirectoryType.EXIF_DIRECTORY_IFD0); - TagInfoXpString EXIF_TAG_XPTITLE = new TagInfoXpString( + public static final TagInfoXpString EXIF_TAG_XPTITLE = new TagInfoXpString( "XPTitle", 0x9c9b, -1, TiffDirectoryType.EXIF_DIRECTORY_IFD0); - TagInfoXpString EXIF_TAG_XPCOMMENT = new TagInfoXpString( + public static final TagInfoXpString EXIF_TAG_XPCOMMENT = new TagInfoXpString( "XPComment", 0x9c9c, -1, TiffDirectoryType.EXIF_DIRECTORY_IFD0); - TagInfoXpString EXIF_TAG_XPAUTHOR = new TagInfoXpString( + public static final TagInfoXpString EXIF_TAG_XPAUTHOR = new TagInfoXpString( "XPAuthor", 0x9c9d, -1, TiffDirectoryType.EXIF_DIRECTORY_IFD0); - TagInfoXpString EXIF_TAG_XPKEYWORDS = new TagInfoXpString( + public static final TagInfoXpString EXIF_TAG_XPKEYWORDS = new TagInfoXpString( "XPKeywords", 0x9c9e, -1, TiffDirectoryType.EXIF_DIRECTORY_IFD0); - TagInfoXpString EXIF_TAG_XPSUBJECT = new TagInfoXpString( + public static final TagInfoXpString EXIF_TAG_XPSUBJECT = new TagInfoXpString( "XPSubject", 0x9c9f, -1, TiffDirectoryType.EXIF_DIRECTORY_IFD0); - List<TagInfo> ALL_MICROSOFT_TAGS = + public static final List<TagInfo> ALL_MICROSOFT_TAGS = Collections.unmodifiableList(Arrays.asList( EXIF_TAG_RATING, EXIF_TAG_RATING_PERCENT, @@ -65,4 +66,7 @@ public interface MicrosoftTagConstants { EXIF_TAG_XPAUTHOR, EXIF_TAG_XPKEYWORDS, EXIF_TAG_XPSUBJECT)); + + private MicrosoftTagConstants() { + } } Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/MolecularDynamicsGelTagConstants.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/MolecularDynamicsGelTagConstants.java?rev=1655143&r1=1655142&r2=1655143&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/MolecularDynamicsGelTagConstants.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/MolecularDynamicsGelTagConstants.java Tue Jan 27 20:15:19 2015 @@ -31,40 +31,41 @@ import org.apache.commons.imaging.format * <BR> * http://www.awaresystems.be/imaging/tiff/tifftags/docs/gel.html */ -public interface MolecularDynamicsGelTagConstants { - TagInfoLong EXIF_TAG_MD_FILE_TAG = new TagInfoLong( +public final class MolecularDynamicsGelTagConstants { + + public static final TagInfoLong EXIF_TAG_MD_FILE_TAG = new TagInfoLong( "MD FileTag", 0x82a5, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoRational EXIF_TAG_MD_SCALE_PIXEL = new TagInfoRational( + public static final TagInfoRational EXIF_TAG_MD_SCALE_PIXEL = new TagInfoRational( "MD ScalePixel", 0x82a6, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoShort EXIF_TAG_MD_COLOR_TABLE = new TagInfoShort( + public static final TagInfoShort EXIF_TAG_MD_COLOR_TABLE = new TagInfoShort( "MD ColorTable", 0x82a7, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoAscii EXIF_TAG_MD_LAB_NAME = new TagInfoAscii( + public static final TagInfoAscii EXIF_TAG_MD_LAB_NAME = new TagInfoAscii( "MD LabName", 0x82a8, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoAscii EXIF_TAG_MD_SAMPLE_INFO = new TagInfoAscii( + public static final TagInfoAscii EXIF_TAG_MD_SAMPLE_INFO = new TagInfoAscii( "MD SampleInfo", 0x82a9, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoAscii EXIF_TAG_MD_PREP_DATE = new TagInfoAscii( + public static final TagInfoAscii EXIF_TAG_MD_PREP_DATE = new TagInfoAscii( "MD PrepDate", 0x82aa, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoAscii EXIF_TAG_MD_PREP_TIME = new TagInfoAscii( + public static final TagInfoAscii EXIF_TAG_MD_PREP_TIME = new TagInfoAscii( "MD PrepTime", 0x82ab, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoAscii EXIF_TAG_MD_FILE_UNITS = new TagInfoAscii( + public static final TagInfoAscii EXIF_TAG_MD_FILE_UNITS = new TagInfoAscii( "MD FileUnits", 0x82ac, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - List<TagInfo> ALL_MOLECULAR_DYNAMICS_GEL_TAGS = + public static final List<TagInfo> ALL_MOLECULAR_DYNAMICS_GEL_TAGS = Collections.unmodifiableList(Arrays.asList( EXIF_TAG_MD_FILE_TAG, EXIF_TAG_MD_SCALE_PIXEL, @@ -74,4 +75,7 @@ public interface MolecularDynamicsGelTag EXIF_TAG_MD_PREP_DATE, EXIF_TAG_MD_PREP_TIME, EXIF_TAG_MD_FILE_UNITS)); + + private MolecularDynamicsGelTagConstants() { + } } Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/OceScanjobTagConstants.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/OceScanjobTagConstants.java?rev=1655143&r1=1655142&r2=1655143&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/OceScanjobTagConstants.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/OceScanjobTagConstants.java Tue Jan 27 20:15:19 2015 @@ -28,27 +28,31 @@ import org.apache.commons.imaging.format * <BR> * http://www.awaresystems.be/imaging/tiff/tifftags/docs/oce.html */ -public interface OceScanjobTagConstants { - TagInfoAscii EXIF_TAG_OCE_SCANJOB_DESCRIPTION = new TagInfoAscii( +public final class OceScanjobTagConstants { + + public static final TagInfoAscii EXIF_TAG_OCE_SCANJOB_DESCRIPTION = new TagInfoAscii( "Oce Scanjob Description", 0xc427, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoAscii EXIF_TAG_OCE_APPLICATION_SELECTOR = new TagInfoAscii( + public static final TagInfoAscii EXIF_TAG_OCE_APPLICATION_SELECTOR = new TagInfoAscii( "Oce Application Selector", 0xc428, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - - TagInfoAscii EXIF_TAG_OCE_IDENTIFICATION_NUMBER = new TagInfoAscii( + + public static final TagInfoAscii EXIF_TAG_OCE_IDENTIFICATION_NUMBER = new TagInfoAscii( "Oce Identification Number", 0xc429, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - - TagInfoAscii EXIF_TAG_OCE_IMAGE_LOGIC_CHARACTERISTICS = new TagInfoAscii( + + public static final TagInfoAscii EXIF_TAG_OCE_IMAGE_LOGIC_CHARACTERISTICS = new TagInfoAscii( "Oce ImageLogic Characteristics", 0xc42a, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - List<TagInfo> ALL_OCE_SCANJOB_TAGS = + public static final List<TagInfo> ALL_OCE_SCANJOB_TAGS = Collections.unmodifiableList(Arrays.<TagInfo> asList( EXIF_TAG_OCE_SCANJOB_DESCRIPTION, EXIF_TAG_OCE_APPLICATION_SELECTOR, EXIF_TAG_OCE_IDENTIFICATION_NUMBER, EXIF_TAG_OCE_IMAGE_LOGIC_CHARACTERISTICS)); + + private OceScanjobTagConstants() { + } } Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/Rfc2301TagConstants.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/Rfc2301TagConstants.java?rev=1655143&r1=1655142&r2=1655143&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/Rfc2301TagConstants.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/Rfc2301TagConstants.java Tue Jan 27 20:15:19 2015 @@ -37,78 +37,79 @@ import org.apache.commons.imaging.format * <BR> * http://cool.conservation-us.org/bytopic/imaging/std/tiff-f.html */ -public interface Rfc2301TagConstants { - TagInfoShortOrLong TIFF_TAG_BAD_FAX_LINES = new TagInfoShortOrLong( +public final class Rfc2301TagConstants { + + public static final TagInfoShortOrLong TIFF_TAG_BAD_FAX_LINES = new TagInfoShortOrLong( "BadFaxLines", 0x0146, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoShort TIFF_TAG_CLEAN_FAX_DATA = new TagInfoShort( + public static final TagInfoShort TIFF_TAG_CLEAN_FAX_DATA = new TagInfoShort( "CleanFaxData", 0x0147, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - int CLEAN_FAX_DATA_VALUE_CLEAN = 0; - int CLEAN_FAX_DATA_VALUE_REGENERATED = 1; - int CLEAN_FAX_DATA_VALUE_UNCLEAN = 2; + public static final int CLEAN_FAX_DATA_VALUE_CLEAN = 0; + public static final int CLEAN_FAX_DATA_VALUE_REGENERATED = 1; + public static final int CLEAN_FAX_DATA_VALUE_UNCLEAN = 2; - TagInfoShortOrLong TIFF_TAG_CONSECUTIVE_BAD_FAX_LINES = new TagInfoShortOrLong( + public static final TagInfoShortOrLong TIFF_TAG_CONSECUTIVE_BAD_FAX_LINES = new TagInfoShortOrLong( "ConsecutiveBadFaxLines", 0x0148, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoDirectory TIFF_TAG_GLOBAL_PARAMETERS_IFD = new TagInfoDirectory( + public static final TagInfoDirectory TIFF_TAG_GLOBAL_PARAMETERS_IFD = new TagInfoDirectory( "GlobalParametersIFD", 0x0190, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoLong TIFF_TAG_PROFILE_TYPE = new TagInfoLong( + public static final TagInfoLong TIFF_TAG_PROFILE_TYPE = new TagInfoLong( "ProfileType", 0x0191, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - int PROFILE_TYPE_VALUE_UNSPECIFIED = 0; - int PROFILE_TYPE_VALUE_GROUP_3_FAX = 1; + public static final int PROFILE_TYPE_VALUE_UNSPECIFIED = 0; + public static final int PROFILE_TYPE_VALUE_GROUP_3_FAX = 1; - TagInfoByte TIFF_TAG_FAX_PROFILE = new TagInfoByte( + public static final TagInfoByte TIFF_TAG_FAX_PROFILE = new TagInfoByte( "FaxProfile", 0x0192, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - int FAX_PROFILE_VALUE_UNKNOWN = 0; - int FAX_PROFILE_VALUE_MINIMAL_B_AND_W_LOSSLESS_S = 1; - int FAX_PROFILE_VALUE_EXTENDED_B_AND_W_LOSSLESS_F = 2; - int FAX_PROFILE_VALUE_LOSSLESS_JBIG_B_AND_W_J = 3; - int FAX_PROFILE_VALUE_LOSSY_COLOR_AND_GRAYSCALE_C = 4; - int FAX_PROFILE_VALUE_LOSSLESS_COLOR_AND_GRAYSCALE_L = 5; - int FAX_PROFILE_VALUE_MIXED_RASTER_CONTENT_M = 6; + public static final int FAX_PROFILE_VALUE_UNKNOWN = 0; + public static final int FAX_PROFILE_VALUE_MINIMAL_B_AND_W_LOSSLESS_S = 1; + public static final int FAX_PROFILE_VALUE_EXTENDED_B_AND_W_LOSSLESS_F = 2; + public static final int FAX_PROFILE_VALUE_LOSSLESS_JBIG_B_AND_W_J = 3; + public static final int FAX_PROFILE_VALUE_LOSSY_COLOR_AND_GRAYSCALE_C = 4; + public static final int FAX_PROFILE_VALUE_LOSSLESS_COLOR_AND_GRAYSCALE_L = 5; + public static final int FAX_PROFILE_VALUE_MIXED_RASTER_CONTENT_M = 6; - TagInfoLong TIFF_TAG_CODING_METHODS = new TagInfoLong( + public static final TagInfoLong TIFF_TAG_CODING_METHODS = new TagInfoLong( "CodingMethods", 0x0193, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - int CODING_METHODS_VALUE_T4_1D = 2; - int CODING_METHODS_VALUE_T4_2D = 4; - int CODING_METHODS_VALUE_T6 = 8; - int CODING_METHODS_VALUE_T82_T85 = 16; - int CODING_METHODS_VALUE_T81 = 32; - int CODING_METHODS_VALUE_T82_T43 = 64; + public static final int CODING_METHODS_VALUE_T4_1D = 2; + public static final int CODING_METHODS_VALUE_T4_2D = 4; + public static final int CODING_METHODS_VALUE_T6 = 8; + public static final int CODING_METHODS_VALUE_T82_T85 = 16; + public static final int CODING_METHODS_VALUE_T81 = 32; + public static final int CODING_METHODS_VALUE_T82_T43 = 64; - TagInfoByte TIFF_TAG_VERSION_YEAR = new TagInfoByte( + public static final TagInfoByte TIFF_TAG_VERSION_YEAR = new TagInfoByte( "VersionYear", 0x0194, 4, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoByte TIFF_TAG_MODE_NUMBER = new TagInfoByte( + public static final TagInfoByte TIFF_TAG_MODE_NUMBER = new TagInfoByte( "ModeNumber", 0x0195, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoRational TIFF_TAG_DECODE = new TagInfoRational( + public static final TagInfoRational TIFF_TAG_DECODE = new TagInfoRational( "Decode", 0x01b1, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoShort TIFF_TAG_DEFAULT_IMAGE_COLOR = new TagInfoShort( + public static final TagInfoShort TIFF_TAG_DEFAULT_IMAGE_COLOR = new TagInfoShort( "DefaultImageColor", 0x01b2, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoLong TIFF_TAG_STRIP_ROW_COUNTS = new TagInfoLong( + public static final TagInfoLong TIFF_TAG_STRIP_ROW_COUNTS = new TagInfoLong( "StripRowCounts", 0x022f, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoShortOrLong TIFF_TAG_IMAGE_LAYER = new TagInfoShortOrLong( + public static final TagInfoShortOrLong TIFF_TAG_IMAGE_LAYER = new TagInfoShortOrLong( "ImageLayer", 0x87ac, 2, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - List<TagInfo> ALL_RFC_2301_TAGS = + public static final List<TagInfo> ALL_RFC_2301_TAGS = Collections.unmodifiableList(Arrays.asList( TIFF_TAG_BAD_FAX_LINES, TIFF_TAG_CLEAN_FAX_DATA, @@ -123,4 +124,7 @@ public interface Rfc2301TagConstants { TIFF_TAG_DEFAULT_IMAGE_COLOR, TIFF_TAG_STRIP_ROW_COUNTS, TIFF_TAG_IMAGE_LAYER)); + + private Rfc2301TagConstants() { + } } Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/Tiff4TagConstants.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/Tiff4TagConstants.java?rev=1655143&r1=1655142&r2=1655143&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/Tiff4TagConstants.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/Tiff4TagConstants.java Tue Jan 27 20:15:19 2015 @@ -28,17 +28,21 @@ import org.apache.commons.imaging.format * <BR> * http://cool.conservation-us.org/bytopic/imaging/std/tiff4.html */ -public interface Tiff4TagConstants { - TagInfoShort TIFF_TAG_COLOR_RESPONSE_UNIT = new TagInfoShort( +public final class Tiff4TagConstants { + + public static final TagInfoShort TIFF_TAG_COLOR_RESPONSE_UNIT = new TagInfoShort( "ColorResponseUnit", 0x12C, 1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); - int COLOR_RESPONSE_UNIT_VALUE_0_1 = 1; - int COLOR_RESPONSE_UNIT_VALUE_0_01 = 2; - int COLOR_RESPONSE_UNIT_VALUE_0_001 = 3; - int COLOR_RESPONSE_UNIT_VALUE_0_0001 = 4; - int COLOR_RESPONSE_UNIT_VALUE_0_00001 = 5; - - List<TagInfo> ALL_TIFF_4_TAGS = + public static final int COLOR_RESPONSE_UNIT_VALUE_0_1 = 1; + public static final int COLOR_RESPONSE_UNIT_VALUE_0_01 = 2; + public static final int COLOR_RESPONSE_UNIT_VALUE_0_001 = 3; + public static final int COLOR_RESPONSE_UNIT_VALUE_0_0001 = 4; + public static final int COLOR_RESPONSE_UNIT_VALUE_0_00001 = 5; + + public static final List<TagInfo> ALL_TIFF_4_TAGS = Collections.unmodifiableList(Arrays.<TagInfo> asList( TIFF_TAG_COLOR_RESPONSE_UNIT)); + + private Tiff4TagConstants() { + } } Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/TiffConstants.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/TiffConstants.java?rev=1655143&r1=1655142&r2=1655143&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/TiffConstants.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/TiffConstants.java Tue Jan 27 20:15:19 2015 @@ -20,28 +20,25 @@ import java.nio.ByteOrder; import org.apache.commons.imaging.ImagingConstants; -public interface TiffConstants - extends - ImagingConstants, - TiffDirectoryConstants, - AllTagConstants { - ByteOrder DEFAULT_TIFF_BYTE_ORDER = ByteOrder.LITTLE_ENDIAN; - - int TIFF_HEADER_SIZE = 8; - int TIFF_DIRECTORY_HEADER_LENGTH = 2; - int TIFF_DIRECTORY_FOOTER_LENGTH = 4; - int TIFF_ENTRY_LENGTH = 12; - int TIFF_ENTRY_MAX_VALUE_LENGTH = 4; - - int TIFF_COMPRESSION_UNCOMPRESSED_1 = 1; - int TIFF_COMPRESSION_UNCOMPRESSED = TIFF_COMPRESSION_UNCOMPRESSED_1; - int TIFF_COMPRESSION_CCITT_1D = 2; - int TIFF_COMPRESSION_CCITT_GROUP_3 = 3; - int TIFF_COMPRESSION_CCITT_GROUP_4 = 4; - int TIFF_COMPRESSION_LZW = 5; - int TIFF_COMPRESSION_JPEG = 6; - int TIFF_COMPRESSION_UNCOMPRESSED_2 = 32771; - int TIFF_COMPRESSION_PACKBITS = 32773; +public final class TiffConstants { + + public static final ByteOrder DEFAULT_TIFF_BYTE_ORDER = ByteOrder.LITTLE_ENDIAN; + + public static final int TIFF_HEADER_SIZE = 8; + public static final int TIFF_DIRECTORY_HEADER_LENGTH = 2; + public static final int TIFF_DIRECTORY_FOOTER_LENGTH = 4; + public static final int TIFF_ENTRY_LENGTH = 12; + public static final int TIFF_ENTRY_MAX_VALUE_LENGTH = 4; + + public static final int TIFF_COMPRESSION_UNCOMPRESSED_1 = 1; + public static final int TIFF_COMPRESSION_UNCOMPRESSED = TIFF_COMPRESSION_UNCOMPRESSED_1; + public static final int TIFF_COMPRESSION_CCITT_1D = 2; + public static final int TIFF_COMPRESSION_CCITT_GROUP_3 = 3; + public static final int TIFF_COMPRESSION_CCITT_GROUP_4 = 4; + public static final int TIFF_COMPRESSION_LZW = 5; + public static final int TIFF_COMPRESSION_JPEG = 6; + public static final int TIFF_COMPRESSION_UNCOMPRESSED_2 = 32771; + public static final int TIFF_COMPRESSION_PACKBITS = 32773; /** * Parameter key. Used in write operations to indicate the desired @@ -51,7 +48,7 @@ public interface TiffConstants * TIFF_FLAG_T4_OPTIONS_2D, TIFF_FLAG_T4_OPTIONS_UNCOMPRESSED_MODE, * and TIFF_FLAG_T4_OPTIONS_FILL flags. */ - String PARAM_KEY_T4_OPTIONS = "T4_OPTIONS"; + public static final String PARAM_KEY_T4_OPTIONS = "T4_OPTIONS"; /** * Parameter key. Used in write operations to indicate the desired @@ -60,25 +57,25 @@ public interface TiffConstants * Valid values: any Integer containing either zero or * TIFF_FLAG_T6_OPTIONS_UNCOMPRESSED_MODE. */ - String PARAM_KEY_T6_OPTIONS = "T6_OPTIONS"; + public static final String PARAM_KEY_T6_OPTIONS = "T6_OPTIONS"; - int TIFF_FLAG_T4_OPTIONS_2D = 1; - int TIFF_FLAG_T4_OPTIONS_UNCOMPRESSED_MODE = 2; - int TIFF_FLAG_T4_OPTIONS_FILL = 4; - int TIFF_FLAG_T6_OPTIONS_UNCOMPRESSED_MODE = 2; + public static final int TIFF_FLAG_T4_OPTIONS_2D = 1; + public static final int TIFF_FLAG_T4_OPTIONS_UNCOMPRESSED_MODE = 2; + public static final int TIFF_FLAG_T4_OPTIONS_FILL = 4; + public static final int TIFF_FLAG_T6_OPTIONS_UNCOMPRESSED_MODE = 2; - String PARAM_KEY_SUBIMAGE_X = "SUBIMAGE_X"; - String PARAM_KEY_SUBIMAGE_Y = "SUBIMAGE_Y"; - String PARAM_KEY_SUBIMAGE_WIDTH = "SUBIMAGE_WIDTH"; - String PARAM_KEY_SUBIMAGE_HEIGHT = "SUBIMAGE_HEIGHT"; + public static final String PARAM_KEY_SUBIMAGE_X = "SUBIMAGE_X"; + public static final String PARAM_KEY_SUBIMAGE_Y = "SUBIMAGE_Y"; + public static final String PARAM_KEY_SUBIMAGE_WIDTH = "SUBIMAGE_WIDTH"; + public static final String PARAM_KEY_SUBIMAGE_HEIGHT = "SUBIMAGE_HEIGHT"; /** * Specifies the amount of memory in bytes to be used for a strip * or tile size when employing LZW compression. The default is * 8000 (roughly 8K). Minimum value is 8000. */ - String PARAM_KEY_LZW_COMPRESSION_BLOCK_SIZE = + public static final String PARAM_KEY_LZW_COMPRESSION_BLOCK_SIZE = "PARAM_KEY_LZW_COMPRESSION_BLOCK_SIZE"; /** @@ -87,7 +84,7 @@ public interface TiffConstants * processing time. Used in conjunction with the * PARAM_KEY_LZW_COMPRESSION_STRIP_SIZE */ - int TIFF_LZW_COMPRESSION_BLOCK_SIZE_MEDIUM = 32768; + public static final int TIFF_LZW_COMPRESSION_BLOCK_SIZE_MEDIUM = 32768; /** * Specifies a larger strip-size to be used for compression. This setting @@ -95,5 +92,8 @@ public interface TiffConstants * processing time. Used in conjunction with the * PARAM_KEY_LZW_COMPRESSION_STRIP_SIZE */ - int TIFF_LZW_COMPRESSION_BLOCK_SIZE_LARGE = 65536; + public static final int TIFF_LZW_COMPRESSION_BLOCK_SIZE_LARGE = 65536; + + private TiffConstants() { + } } Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/TiffDirectoryConstants.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/TiffDirectoryConstants.java?rev=1655143&r1=1655142&r2=1655143&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/TiffDirectoryConstants.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/TiffDirectoryConstants.java Tue Jan 27 20:15:19 2015 @@ -16,22 +16,26 @@ */ package org.apache.commons.imaging.formats.tiff.constants; -public interface TiffDirectoryConstants { +public final class TiffDirectoryConstants { - int DIRECTORY_TYPE_UNKNOWN = -1; - int DIRECTORY_TYPE_ROOT = 0; - int DIRECTORY_TYPE_SUB = 1; - int DIRECTORY_TYPE_SUB0 = 1; - int DIRECTORY_TYPE_SUB1 = 2; - int DIRECTORY_TYPE_SUB2 = 3; - int DIRECTORY_TYPE_THUMBNAIL = 2; - int DIRECTORY_TYPE_EXIF = -2; - int DIRECTORY_TYPE_GPS = -3; - int DIRECTORY_TYPE_INTEROPERABILITY = -4; - int DIRECTORY_TYPE_MAKER_NOTES = -5; - int DIRECTORY_TYPE_DIR_0 = 0; - int DIRECTORY_TYPE_DIR_1 = 1; - int DIRECTORY_TYPE_DIR_2 = 2; - int DIRECTORY_TYPE_DIR_3 = 3; - int DIRECTORY_TYPE_DIR_4 = 4; + public static final int DIRECTORY_TYPE_UNKNOWN = -1; + public static final int DIRECTORY_TYPE_ROOT = 0; + public static final int DIRECTORY_TYPE_SUB = 1; + public static final int DIRECTORY_TYPE_SUB0 = 1; + public static final int DIRECTORY_TYPE_SUB1 = 2; + public static final int DIRECTORY_TYPE_SUB2 = 3; + public static final int DIRECTORY_TYPE_THUMBNAIL = 2; + public static final int DIRECTORY_TYPE_EXIF = -2; + public static final int DIRECTORY_TYPE_GPS = -3; + public static final int DIRECTORY_TYPE_INTEROPERABILITY = -4; + public static final int DIRECTORY_TYPE_MAKER_NOTES = -5; + public static final int DIRECTORY_TYPE_DIR_0 = 0; + public static final int DIRECTORY_TYPE_DIR_1 = 1; + public static final int DIRECTORY_TYPE_DIR_2 = 2; + public static final int DIRECTORY_TYPE_DIR_3 = 3; + public static final int DIRECTORY_TYPE_DIR_4 = 4; + + // TODO: this should really be an enum + private TiffDirectoryConstants() { + } } Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/TiffDirectoryType.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/TiffDirectoryType.java?rev=1655143&r1=1655142&r2=1655143&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/TiffDirectoryType.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/TiffDirectoryType.java Tue Jan 27 20:15:19 2015 @@ -52,6 +52,16 @@ public enum TiffDirectoryType { return isImageDirectory; } + public static TiffDirectoryType getExifDirectoryType(final int type) { + + for (final TiffDirectoryType tiffDirectoryType : values()) { + if (tiffDirectoryType.directoryType == type) { + return tiffDirectoryType; + } + } + return TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN; + } + public static final TiffDirectoryType EXIF_DIRECTORY_IFD0 = TIFF_DIRECTORY_IFD0; public static final TiffDirectoryType TIFF_DIRECTORY_ROOT = TIFF_DIRECTORY_IFD0; public static final TiffDirectoryType EXIF_DIRECTORY_IFD1 = TIFF_DIRECTORY_IFD1; Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/TiffEpTagConstants.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/TiffEpTagConstants.java?rev=1655143&r1=1655142&r2=1655143&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/TiffEpTagConstants.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/TiffEpTagConstants.java Tue Jan 27 20:15:19 2015 @@ -33,97 +33,98 @@ import org.apache.commons.imaging.format /** * */ -public interface TiffEpTagConstants { - TagInfoShort EXIF_TAG_CFAREPEAT_PATTERN_DIM = new TagInfoShort( +public final class TiffEpTagConstants { + + public static final TagInfoShort EXIF_TAG_CFAREPEAT_PATTERN_DIM = new TagInfoShort( "CFARepeatPatternDim", 0x828d, 2, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoByte EXIF_TAG_CFAPATTERN_2 = new TagInfoByte( + public static final TagInfoByte EXIF_TAG_CFAPATTERN_2 = new TagInfoByte( "CFAPattern2", 0x828e, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoAsciiOrRational EXIF_TAG_BATTERY_LEVEL = new TagInfoAsciiOrRational( + public static final TagInfoAsciiOrRational EXIF_TAG_BATTERY_LEVEL = new TagInfoAsciiOrRational( "BatteryLevel", 0x828f, -1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); - TagInfoUndefined EXIF_TAG_INTER_COLOR_PROFILE = new TagInfoUndefined( + public static final TagInfoUndefined EXIF_TAG_INTER_COLOR_PROFILE = new TagInfoUndefined( "InterColorProfile", 0x8773, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoShort EXIF_TAG_INTERLACE = new TagInfoShort( + public static final TagInfoShort EXIF_TAG_INTERLACE = new TagInfoShort( "Interlace", 0x8829, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoSShort EXIF_TAG_TIME_ZONE_OFFSET = new TagInfoSShort( + public static final TagInfoSShort EXIF_TAG_TIME_ZONE_OFFSET = new TagInfoSShort( "TimeZoneOffset", 0x882a, -1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - TagInfoShort EXIF_TAG_SELF_TIMER_MODE = new TagInfoShort( + public static final TagInfoShort EXIF_TAG_SELF_TIMER_MODE = new TagInfoShort( "SelfTimerMode", 0x882b, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - TagInfoRational EXIF_TAG_FLASH_ENERGY = new TagInfoRational( + public static final TagInfoRational EXIF_TAG_FLASH_ENERGY = new TagInfoRational( "FlashEnergy", 0x920b, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoUndefined EXIF_TAG_SPATIAL_FREQUENCY_RESPONSE_1 = new TagInfoUndefined( + public static final TagInfoUndefined EXIF_TAG_SPATIAL_FREQUENCY_RESPONSE_1 = new TagInfoUndefined( "SpatialFrequencyResponse", 0x920c, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoUndefined EXIF_TAG_NOISE_1 = new TagInfoUndefined( + public static final TagInfoUndefined EXIF_TAG_NOISE_1 = new TagInfoUndefined( "Noise", 0x920d, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoRational EXIF_TAG_FOCAL_PLANE_XRESOLUTION = new TagInfoRational( + public static final TagInfoRational EXIF_TAG_FOCAL_PLANE_XRESOLUTION = new TagInfoRational( "FocalPlaneXResolution", 0x920e, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoRational EXIF_TAG_FOCAL_PLANE_YRESOLUTION = new TagInfoRational( + public static final TagInfoRational EXIF_TAG_FOCAL_PLANE_YRESOLUTION = new TagInfoRational( "FocalPlaneYResolution", 0x920f, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoShort EXIF_TAG_FOCAL_PLANE_RESOLUTION_UNIT = new TagInfoShort( + public static final TagInfoShort EXIF_TAG_FOCAL_PLANE_RESOLUTION_UNIT = new TagInfoShort( "FocalPlaneResolutionUnit", 0x9210, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - int FOCAL_PLANE_RESOLUTION_UNIT_VALUE_NONE = 1; - int FOCAL_PLANE_RESOLUTION_UNIT_VALUE_INCHES = 2; - int FOCAL_PLANE_RESOLUTION_UNIT_VALUE_CM = 3; - int FOCAL_PLANE_RESOLUTION_UNIT_VALUE_MM = 4; - int FOCAL_PLANE_RESOLUTION_UNIT_VALUE_UM = 5; + public static final int FOCAL_PLANE_RESOLUTION_UNIT_VALUE_NONE = 1; + public static final int FOCAL_PLANE_RESOLUTION_UNIT_VALUE_INCHES = 2; + public static final int FOCAL_PLANE_RESOLUTION_UNIT_VALUE_CM = 3; + public static final int FOCAL_PLANE_RESOLUTION_UNIT_VALUE_MM = 4; + public static final int FOCAL_PLANE_RESOLUTION_UNIT_VALUE_UM = 5; - TagInfoLong EXIF_TAG_IMAGE_NUMBER_EXIF_IFD = new TagInfoLong( + public static final TagInfoLong EXIF_TAG_IMAGE_NUMBER_EXIF_IFD = new TagInfoLong( "ImageNumber", 0x9211, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - TagInfoAscii EXIF_TAG_SECURITY_CLASSIFICATION_EXIF_IFD = new TagInfoAscii( + public static final TagInfoAscii EXIF_TAG_SECURITY_CLASSIFICATION_EXIF_IFD = new TagInfoAscii( "SecurityClassification", 0x9212, -1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - TagInfoAscii EXIF_TAG_IMAGE_HISTORY_EXIF_IFD = new TagInfoAscii( + public static final TagInfoAscii EXIF_TAG_IMAGE_HISTORY_EXIF_IFD = new TagInfoAscii( "ImageHistory", 0x9213, -1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - TagInfoRational EXIF_TAG_EXPOSURE_INDEX = new TagInfoRational( + public static final TagInfoRational EXIF_TAG_EXPOSURE_INDEX = new TagInfoRational( "ExposureIndex", 0x9215, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoByte EXIF_TAG_TIFF_EPSTANDARD_ID_1 = new TagInfoByte( + public static final TagInfoByte EXIF_TAG_TIFF_EPSTANDARD_ID_1 = new TagInfoByte( "TIFF/EPStandardID", 0x9216, 4, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoShort EXIF_TAG_SENSING_METHOD = new TagInfoShort( + public static final TagInfoShort EXIF_TAG_SENSING_METHOD = new TagInfoShort( "SensingMethod", 0x9217, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - int SENSING_METHOD_VALUE_MONOCHROME_AREA = 1; - int SENSING_METHOD_VALUE_ONE_CHIP_COLOR_AREA = 2; - int SENSING_METHOD_VALUE_TWO_CHIP_COLOR_AREA = 3; - int SENSING_METHOD_VALUE_THREE_CHIP_COLOR_AREA = 4; - int SENSING_METHOD_VALUE_COLOR_SEQUENTIAL_AREA = 5; - int SENSING_METHOD_VALUE_MONOCHROME_LINEAR = 6; - int SENSING_METHOD_VALUE_TRILINEAR = 7; - int SENSING_METHOD_VALUE_COLOR_SEQUENTIAL_LINEAR = 8; + public static final int SENSING_METHOD_VALUE_MONOCHROME_AREA = 1; + public static final int SENSING_METHOD_VALUE_ONE_CHIP_COLOR_AREA = 2; + public static final int SENSING_METHOD_VALUE_TWO_CHIP_COLOR_AREA = 3; + public static final int SENSING_METHOD_VALUE_THREE_CHIP_COLOR_AREA = 4; + public static final int SENSING_METHOD_VALUE_COLOR_SEQUENTIAL_AREA = 5; + public static final int SENSING_METHOD_VALUE_MONOCHROME_LINEAR = 6; + public static final int SENSING_METHOD_VALUE_TRILINEAR = 7; + public static final int SENSING_METHOD_VALUE_COLOR_SEQUENTIAL_LINEAR = 8; - List<TagInfo> ALL_TIFF_EP_TAGS = + public static final List<TagInfo> ALL_TIFF_EP_TAGS = Collections.unmodifiableList(Arrays.asList( EXIF_TAG_CFAREPEAT_PATTERN_DIM, EXIF_TAG_CFAPATTERN_2, @@ -144,4 +145,7 @@ public interface TiffEpTagConstants { EXIF_TAG_EXPOSURE_INDEX, EXIF_TAG_TIFF_EPSTANDARD_ID_1, EXIF_TAG_SENSING_METHOD)); + + private TiffEpTagConstants() { + } } Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/TiffTagConstants.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/TiffTagConstants.java?rev=1655143&r1=1655142&r2=1655143&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/TiffTagConstants.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/TiffTagConstants.java Tue Jan 27 20:15:19 2015 @@ -36,406 +36,407 @@ import org.apache.commons.imaging.format * <BR> * http://partners.adobe.com/public/developer/en/tiff/TIFF6.pdf */ -public interface TiffTagConstants { - TagInfoLong TIFF_TAG_NEW_SUBFILE_TYPE = new TagInfoLong( +public final class TiffTagConstants { + + public static final TagInfoLong TIFF_TAG_NEW_SUBFILE_TYPE = new TagInfoLong( "NewSubfileType", 0xFE, 1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); - int SUBFILE_TYPE_VALUE_FULL_RESOLUTION_IMAGE = 0; - int SUBFILE_TYPE_VALUE_REDUCED_RESOLUTION_IMAGE = 1; - int SUBFILE_TYPE_VALUE_SINGLE_PAGE_OF_MULTI_PAGE_IMAGE = 2; - int SUBFILE_TYPE_VALUE_SINGLE_PAGE_OF_MULTI_PAGE_REDUCED_RESOLUTION_IMAGE = 3; - int SUBFILE_TYPE_VALUE_TRANSPARENCY_MASK = 4; - int SUBFILE_TYPE_VALUE_TRANSPARENCY_MASK_OF_REDUCED_RESOLUTION_IMAGE = 5; - int SUBFILE_TYPE_VALUE_TRANSPARENCY_MASK_OF_MULTI_PAGE_IMAGE = 6; - int SUBFILE_TYPE_VALUE_TRANSPARENCY_MASK_OF_REDUCED_RESOLUTION_MULTI_PAGE_IMAGE = 7; + public static final int SUBFILE_TYPE_VALUE_FULL_RESOLUTION_IMAGE = 0; + public static final int SUBFILE_TYPE_VALUE_REDUCED_RESOLUTION_IMAGE = 1; + public static final int SUBFILE_TYPE_VALUE_SINGLE_PAGE_OF_MULTI_PAGE_IMAGE = 2; + public static final int SUBFILE_TYPE_VALUE_SINGLE_PAGE_OF_MULTI_PAGE_REDUCED_RESOLUTION_IMAGE = 3; + public static final int SUBFILE_TYPE_VALUE_TRANSPARENCY_MASK = 4; + public static final int SUBFILE_TYPE_VALUE_TRANSPARENCY_MASK_OF_REDUCED_RESOLUTION_IMAGE = 5; + public static final int SUBFILE_TYPE_VALUE_TRANSPARENCY_MASK_OF_MULTI_PAGE_IMAGE = 6; + public static final int SUBFILE_TYPE_VALUE_TRANSPARENCY_MASK_OF_REDUCED_RESOLUTION_MULTI_PAGE_IMAGE = 7; - TagInfoShort TIFF_TAG_SUBFILE_TYPE = new TagInfoShort( + public static final TagInfoShort TIFF_TAG_SUBFILE_TYPE = new TagInfoShort( "SubfileType", 0xFF, 1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); - int OLD_SUBFILE_TYPE_VALUE_FULL_RESOLUTION_IMAGE = 1; - int OLD_SUBFILE_TYPE_VALUE_REDUCED_RESOLUTION_IMAGE = 2; - int OLD_SUBFILE_TYPE_VALUE_SINGLE_PAGE_OF_MULTI_PAGE_IMAGE = 3; + public static final int OLD_SUBFILE_TYPE_VALUE_FULL_RESOLUTION_IMAGE = 1; + public static final int OLD_SUBFILE_TYPE_VALUE_REDUCED_RESOLUTION_IMAGE = 2; + public static final int OLD_SUBFILE_TYPE_VALUE_SINGLE_PAGE_OF_MULTI_PAGE_IMAGE = 3; - TagInfoShortOrLong TIFF_TAG_IMAGE_WIDTH = new TagInfoShortOrLong( + public static final TagInfoShortOrLong TIFF_TAG_IMAGE_WIDTH = new TagInfoShortOrLong( "ImageWidth", 0x100, 1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); - TagInfoShortOrLong TIFF_TAG_IMAGE_LENGTH = new TagInfoShortOrLong( + public static final TagInfoShortOrLong TIFF_TAG_IMAGE_LENGTH = new TagInfoShortOrLong( "ImageLength", 0x101, 1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); - TagInfoShort TIFF_TAG_BITS_PER_SAMPLE = new TagInfoShort( + public static final TagInfoShort TIFF_TAG_BITS_PER_SAMPLE = new TagInfoShort( "BitsPerSample", 0x102, -1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); - TagInfoShort TIFF_TAG_COMPRESSION = new TagInfoShort( + public static final TagInfoShort TIFF_TAG_COMPRESSION = new TagInfoShort( "Compression", 0x103, 1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); - int COMPRESSION_VALUE_UNCOMPRESSED = 1; - int COMPRESSION_VALUE_CCITT_1D = 2; - int COMPRESSION_VALUE_T4_GROUP_3_FAX = 3; - int COMPRESSION_VALUE_T6_GROUP_4_FAX = 4; - int COMPRESSION_VALUE_LZW = 5; - int COMPRESSION_VALUE_JPEG_OLD_STYLE = 6; - int COMPRESSION_VALUE_JPEG = 7; - int COMPRESSION_VALUE_ADOBE_DEFLATE = 8; - int COMPRESSION_VALUE_JBIG_B_AND_W = 9; - int COMPRESSION_VALUE_JBIG_COLOR = 10; - int COMPRESSION_VALUE_NEXT = 32766; - int COMPRESSION_VALUE_EPSON_ERF_COMPRESSED = 32769; - int COMPRESSION_VALUE_CCIRLEW = 32771; - int COMPRESSION_VALUE_PACK_BITS = 32773; - int COMPRESSION_VALUE_THUNDERSCAN = 32809; - int COMPRESSION_VALUE_IT8CTPAD = 32895; - int COMPRESSION_VALUE_IT8LW = 32896; - int COMPRESSION_VALUE_IT8MP = 32897; - int COMPRESSION_VALUE_IT8BL = 32898; - int COMPRESSION_VALUE_PIXAR_FILM = 32908; - int COMPRESSION_VALUE_PIXAR_LOG = 32909; - int COMPRESSION_VALUE_DEFLATE = 32946; - int COMPRESSION_VALUE_DCS = 32947; - int COMPRESSION_VALUE_JBIG = 34661; - int COMPRESSION_VALUE_SGILOG = 34676; - int COMPRESSION_VALUE_SGILOG_24 = 34677; - int COMPRESSION_VALUE_JPEG_2000 = 34712; - int COMPRESSION_VALUE_NIKON_NEF_COMPRESSED = 34713; - int COMPRESSION_VALUE_KODAK_DCR_COMPRESSED = 65000; - int COMPRESSION_VALUE_PENTAX_PEF_COMPRESSED = 65535; + public static final int COMPRESSION_VALUE_UNCOMPRESSED = 1; + public static final int COMPRESSION_VALUE_CCITT_1D = 2; + public static final int COMPRESSION_VALUE_T4_GROUP_3_FAX = 3; + public static final int COMPRESSION_VALUE_T6_GROUP_4_FAX = 4; + public static final int COMPRESSION_VALUE_LZW = 5; + public static final int COMPRESSION_VALUE_JPEG_OLD_STYLE = 6; + public static final int COMPRESSION_VALUE_JPEG = 7; + public static final int COMPRESSION_VALUE_ADOBE_DEFLATE = 8; + public static final int COMPRESSION_VALUE_JBIG_B_AND_W = 9; + public static final int COMPRESSION_VALUE_JBIG_COLOR = 10; + public static final int COMPRESSION_VALUE_NEXT = 32766; + public static final int COMPRESSION_VALUE_EPSON_ERF_COMPRESSED = 32769; + public static final int COMPRESSION_VALUE_CCIRLEW = 32771; + public static final int COMPRESSION_VALUE_PACK_BITS = 32773; + public static final int COMPRESSION_VALUE_THUNDERSCAN = 32809; + public static final int COMPRESSION_VALUE_IT8CTPAD = 32895; + public static final int COMPRESSION_VALUE_IT8LW = 32896; + public static final int COMPRESSION_VALUE_IT8MP = 32897; + public static final int COMPRESSION_VALUE_IT8BL = 32898; + public static final int COMPRESSION_VALUE_PIXAR_FILM = 32908; + public static final int COMPRESSION_VALUE_PIXAR_LOG = 32909; + public static final int COMPRESSION_VALUE_DEFLATE = 32946; + public static final int COMPRESSION_VALUE_DCS = 32947; + public static final int COMPRESSION_VALUE_JBIG = 34661; + public static final int COMPRESSION_VALUE_SGILOG = 34676; + public static final int COMPRESSION_VALUE_SGILOG_24 = 34677; + public static final int COMPRESSION_VALUE_JPEG_2000 = 34712; + public static final int COMPRESSION_VALUE_NIKON_NEF_COMPRESSED = 34713; + public static final int COMPRESSION_VALUE_KODAK_DCR_COMPRESSED = 65000; + public static final int COMPRESSION_VALUE_PENTAX_PEF_COMPRESSED = 65535; - TagInfoShort TIFF_TAG_PHOTOMETRIC_INTERPRETATION = new TagInfoShort( + public static final TagInfoShort TIFF_TAG_PHOTOMETRIC_INTERPRETATION = new TagInfoShort( "PhotometricInterpretation", 0x106, 1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); - int PHOTOMETRIC_INTERPRETATION_VALUE_WHITE_IS_ZERO = 0; - int PHOTOMETRIC_INTERPRETATION_VALUE_BLACK_IS_ZERO = 1; - int PHOTOMETRIC_INTERPRETATION_VALUE_RGB = 2; - int PHOTOMETRIC_INTERPRETATION_VALUE_RGB_PALETTE = 3; - int PHOTOMETRIC_INTERPRETATION_VALUE_TRANSPARENCY_MASK = 4; - int PHOTOMETRIC_INTERPRETATION_VALUE_CMYK = 5; - int PHOTOMETRIC_INTERPRETATION_VALUE_YCB_CR = 6; - int PHOTOMETRIC_INTERPRETATION_VALUE_CIELAB = 8; - int PHOTOMETRIC_INTERPRETATION_VALUE_ICCLAB = 9; - int PHOTOMETRIC_INTERPRETATION_VALUE_ITULAB = 10; - int PHOTOMETRIC_INTERPRETATION_VALUE_COLOR_FILTER_ARRAY = 32803; - int PHOTOMETRIC_INTERPRETATION_VALUE_PIXAR_LOG_L = 32844; - int PHOTOMETRIC_INTERPRETATION_VALUE_PIXAR_LOG_LUV = 32845; - int PHOTOMETRIC_INTERPRETATION_VALUE_LINEAR_RAW = 34892; + public static final int PHOTOMETRIC_INTERPRETATION_VALUE_WHITE_IS_ZERO = 0; + public static final int PHOTOMETRIC_INTERPRETATION_VALUE_BLACK_IS_ZERO = 1; + public static final int PHOTOMETRIC_INTERPRETATION_VALUE_RGB = 2; + public static final int PHOTOMETRIC_INTERPRETATION_VALUE_RGB_PALETTE = 3; + public static final int PHOTOMETRIC_INTERPRETATION_VALUE_TRANSPARENCY_MASK = 4; + public static final int PHOTOMETRIC_INTERPRETATION_VALUE_CMYK = 5; + public static final int PHOTOMETRIC_INTERPRETATION_VALUE_YCB_CR = 6; + public static final int PHOTOMETRIC_INTERPRETATION_VALUE_CIELAB = 8; + public static final int PHOTOMETRIC_INTERPRETATION_VALUE_ICCLAB = 9; + public static final int PHOTOMETRIC_INTERPRETATION_VALUE_ITULAB = 10; + public static final int PHOTOMETRIC_INTERPRETATION_VALUE_COLOR_FILTER_ARRAY = 32803; + public static final int PHOTOMETRIC_INTERPRETATION_VALUE_PIXAR_LOG_L = 32844; + public static final int PHOTOMETRIC_INTERPRETATION_VALUE_PIXAR_LOG_LUV = 32845; + public static final int PHOTOMETRIC_INTERPRETATION_VALUE_LINEAR_RAW = 34892; - TagInfoShort TIFF_TAG_THRESHHOLDING = new TagInfoShort( + public static final TagInfoShort TIFF_TAG_THRESHHOLDING = new TagInfoShort( "Threshholding", 0x107, 1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); - int THRESHOLDING_VALUE_NO_DITHERING_OR_HALFTONING = 1; - int THRESHOLDING_VALUE_ORDERED_DITHER_OR_HALFTONE = 2; - int THRESHOLDING_VALUE_RANDOMIZED_DITHER = 3; + public static final int THRESHOLDING_VALUE_NO_DITHERING_OR_HALFTONING = 1; + public static final int THRESHOLDING_VALUE_ORDERED_DITHER_OR_HALFTONE = 2; + public static final int THRESHOLDING_VALUE_RANDOMIZED_DITHER = 3; - TagInfoShort TIFF_TAG_CELL_WIDTH = new TagInfoShort( + public static final TagInfoShort TIFF_TAG_CELL_WIDTH = new TagInfoShort( "CellWidth", 0x108, 1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); - TagInfoShort TIFF_TAG_CELL_LENGTH = new TagInfoShort( + public static final TagInfoShort TIFF_TAG_CELL_LENGTH = new TagInfoShort( "CellLength", 0x109, 1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); - TagInfoShort TIFF_TAG_FILL_ORDER = new TagInfoShort( + public static final TagInfoShort TIFF_TAG_FILL_ORDER = new TagInfoShort( "FillOrder", 0x10A, 1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); - int FILL_ORDER_VALUE_NORMAL = 1; - int FILL_ORDER_VALUE_REVERSED = 2; + public static final int FILL_ORDER_VALUE_NORMAL = 1; + public static final int FILL_ORDER_VALUE_REVERSED = 2; - TagInfoAscii TIFF_TAG_DOCUMENT_NAME = new TagInfoAscii( + public static final TagInfoAscii TIFF_TAG_DOCUMENT_NAME = new TagInfoAscii( "DocumentName", 0x10D, -1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); - TagInfoAscii TIFF_TAG_IMAGE_DESCRIPTION = new TagInfoAscii( + public static final TagInfoAscii TIFF_TAG_IMAGE_DESCRIPTION = new TagInfoAscii( "ImageDescription", 0x10E, -1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); - TagInfoAscii TIFF_TAG_MAKE = new TagInfoAscii( + public static final TagInfoAscii TIFF_TAG_MAKE = new TagInfoAscii( "Make", 0x10F, -1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); - TagInfoAscii TIFF_TAG_MODEL = new TagInfoAscii( + public static final TagInfoAscii TIFF_TAG_MODEL = new TagInfoAscii( "Model", 0x110, -1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); - TagInfoShortOrLong TIFF_TAG_STRIP_OFFSETS = new TagInfoShortOrLong( + public static final TagInfoShortOrLong TIFF_TAG_STRIP_OFFSETS = new TagInfoShortOrLong( "StripOffsets", 0x111, -1, TiffDirectoryType.TIFF_DIRECTORY_ROOT, true); - TagInfoShort TIFF_TAG_ORIENTATION = new TagInfoShort( + public static final TagInfoShort TIFF_TAG_ORIENTATION = new TagInfoShort( "Orientation", 0x112, 1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); - int ORIENTATION_VALUE_HORIZONTAL_NORMAL = 1; - int ORIENTATION_VALUE_MIRROR_HORIZONTAL = 2; - int ORIENTATION_VALUE_ROTATE_180 = 3; - int ORIENTATION_VALUE_MIRROR_VERTICAL = 4; - int ORIENTATION_VALUE_MIRROR_HORIZONTAL_AND_ROTATE_270_CW = 5; - int ORIENTATION_VALUE_ROTATE_90_CW = 6; - int ORIENTATION_VALUE_MIRROR_HORIZONTAL_AND_ROTATE_90_CW = 7; - int ORIENTATION_VALUE_ROTATE_270_CW = 8; + public static final int ORIENTATION_VALUE_HORIZONTAL_NORMAL = 1; + public static final int ORIENTATION_VALUE_MIRROR_HORIZONTAL = 2; + public static final int ORIENTATION_VALUE_ROTATE_180 = 3; + public static final int ORIENTATION_VALUE_MIRROR_VERTICAL = 4; + public static final int ORIENTATION_VALUE_MIRROR_HORIZONTAL_AND_ROTATE_270_CW = 5; + public static final int ORIENTATION_VALUE_ROTATE_90_CW = 6; + public static final int ORIENTATION_VALUE_MIRROR_HORIZONTAL_AND_ROTATE_90_CW = 7; + public static final int ORIENTATION_VALUE_ROTATE_270_CW = 8; - TagInfoShort TIFF_TAG_SAMPLES_PER_PIXEL = new TagInfoShort( + public static final TagInfoShort TIFF_TAG_SAMPLES_PER_PIXEL = new TagInfoShort( "SamplesPerPixel", 0x115, 1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); - TagInfoShortOrLong TIFF_TAG_ROWS_PER_STRIP = new TagInfoShortOrLong( + public static final TagInfoShortOrLong TIFF_TAG_ROWS_PER_STRIP = new TagInfoShortOrLong( "RowsPerStrip", 0x116, 1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); - TagInfoShortOrLong TIFF_TAG_STRIP_BYTE_COUNTS = new TagInfoShortOrLong( + public static final TagInfoShortOrLong TIFF_TAG_STRIP_BYTE_COUNTS = new TagInfoShortOrLong( "StripByteCounts", 0x117, -1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); - TagInfoShort TIFF_TAG_MIN_SAMPLE_VALUE = new TagInfoShort( + public static final TagInfoShort TIFF_TAG_MIN_SAMPLE_VALUE = new TagInfoShort( "MinSampleValue", 0x118, -1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); - TagInfoShort TIFF_TAG_MAX_SAMPLE_VALUE = new TagInfoShort( + public static final TagInfoShort TIFF_TAG_MAX_SAMPLE_VALUE = new TagInfoShort( "MaxSampleValue", 0x119, -1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); - TagInfoRational TIFF_TAG_XRESOLUTION = new TagInfoRational( + public static final TagInfoRational TIFF_TAG_XRESOLUTION = new TagInfoRational( "XResolution", 0x11A, 1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); - TagInfoRational TIFF_TAG_YRESOLUTION = new TagInfoRational( + public static final TagInfoRational TIFF_TAG_YRESOLUTION = new TagInfoRational( "YResolution", 0x11B, 1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); - TagInfoShort TIFF_TAG_PLANAR_CONFIGURATION = new TagInfoShort( + public static final TagInfoShort TIFF_TAG_PLANAR_CONFIGURATION = new TagInfoShort( "PlanarConfiguration", 0x11C, 1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); - int PLANAR_CONFIGURATION_VALUE_CHUNKY = 1; - int PLANAR_CONFIGURATION_VALUE_PLANAR = 2; + public static final int PLANAR_CONFIGURATION_VALUE_CHUNKY = 1; + public static final int PLANAR_CONFIGURATION_VALUE_PLANAR = 2; - TagInfoAscii TIFF_TAG_PAGE_NAME = new TagInfoAscii( + public static final TagInfoAscii TIFF_TAG_PAGE_NAME = new TagInfoAscii( "PageName", 0x11D, -1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); - TagInfoRational TIFF_TAG_XPOSITION = new TagInfoRational( + public static final TagInfoRational TIFF_TAG_XPOSITION = new TagInfoRational( "XPosition", 0x11E, -1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); - TagInfoRational TIFF_TAG_YPOSITION = new TagInfoRational( + public static final TagInfoRational TIFF_TAG_YPOSITION = new TagInfoRational( "YPosition", 0x11F, -1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); - TagInfoLong TIFF_TAG_FREE_OFFSETS = new TagInfoLong( + public static final TagInfoLong TIFF_TAG_FREE_OFFSETS = new TagInfoLong( "FreeOffsets", 0x120, -1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); - TagInfoLong TIFF_TAG_FREE_BYTE_COUNTS = new TagInfoLong( + public static final TagInfoLong TIFF_TAG_FREE_BYTE_COUNTS = new TagInfoLong( "FreeByteCounts", 0x121, -1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); - TagInfoShort TIFF_TAG_GRAY_RESPONSE_UNIT = new TagInfoShort( + public static final TagInfoShort TIFF_TAG_GRAY_RESPONSE_UNIT = new TagInfoShort( "GrayResponseUnit", 0x122, 1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); - int GRAY_RESPONSE_UNIT_VALUE_0_1 = 1; - int GRAY_RESPONSE_UNIT_VALUE_0_01 = 2; - int GRAY_RESPONSE_UNIT_VALUE_0_001 = 3; - int GRAY_RESPONSE_UNIT_VALUE_0_0001 = 4; - int GRAY_RESPONSE_UNIT_VALUE_0_00001 = 5; + public static final int GRAY_RESPONSE_UNIT_VALUE_0_1 = 1; + public static final int GRAY_RESPONSE_UNIT_VALUE_0_01 = 2; + public static final int GRAY_RESPONSE_UNIT_VALUE_0_001 = 3; + public static final int GRAY_RESPONSE_UNIT_VALUE_0_0001 = 4; + public static final int GRAY_RESPONSE_UNIT_VALUE_0_00001 = 5; - TagInfoShort TIFF_TAG_GRAY_RESPONSE_CURVE = new TagInfoShort( + public static final TagInfoShort TIFF_TAG_GRAY_RESPONSE_CURVE = new TagInfoShort( "GrayResponseCurve", 0x123, -1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); - TagInfoLong TIFF_TAG_T4_OPTIONS = new TagInfoLong( + public static final TagInfoLong TIFF_TAG_T4_OPTIONS = new TagInfoLong( "T4Options", 0x124, 1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); - TagInfoLong TIFF_TAG_T6_OPTIONS = new TagInfoLong( + public static final TagInfoLong TIFF_TAG_T6_OPTIONS = new TagInfoLong( "T6Options", 0x125, 1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); - TagInfoShort TIFF_TAG_RESOLUTION_UNIT = new TagInfoShort( + public static final TagInfoShort TIFF_TAG_RESOLUTION_UNIT = new TagInfoShort( "ResolutionUnit", 0x128, 1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); - int RESOLUTION_UNIT_VALUE_NONE = 1; - int RESOLUTION_UNIT_VALUE_INCHES = 2; - int RESOLUTION_UNIT_VALUE_CM = 3; + public static final int RESOLUTION_UNIT_VALUE_NONE = 1; + public static final int RESOLUTION_UNIT_VALUE_INCHES = 2; + public static final int RESOLUTION_UNIT_VALUE_CM = 3; - TagInfoShort TIFF_TAG_PAGE_NUMBER = new TagInfoShort( + public static final TagInfoShort TIFF_TAG_PAGE_NUMBER = new TagInfoShort( "PageNumber", 0x129, 2, TiffDirectoryType.TIFF_DIRECTORY_ROOT); - TagInfoShort TIFF_TAG_TRANSFER_FUNCTION = new TagInfoShort( + public static final TagInfoShort TIFF_TAG_TRANSFER_FUNCTION = new TagInfoShort( "TransferFunction", 0x12D, -1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); - TagInfoAscii TIFF_TAG_SOFTWARE = new TagInfoAscii( + public static final TagInfoAscii TIFF_TAG_SOFTWARE = new TagInfoAscii( "Software", 0x131, -1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); - TagInfoAscii TIFF_TAG_DATE_TIME = new TagInfoAscii( + public static final TagInfoAscii TIFF_TAG_DATE_TIME = new TagInfoAscii( "DateTime", 0x132, 20, TiffDirectoryType.TIFF_DIRECTORY_ROOT); - TagInfoAscii TIFF_TAG_ARTIST = new TagInfoAscii( + public static final TagInfoAscii TIFF_TAG_ARTIST = new TagInfoAscii( "Artist", 0x13B, -1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); - TagInfoAscii TIFF_TAG_HOST_COMPUTER = new TagInfoAscii( + public static final TagInfoAscii TIFF_TAG_HOST_COMPUTER = new TagInfoAscii( "HostComputer", 0x13C, -1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); - TagInfoShort TIFF_TAG_PREDICTOR = new TagInfoShort( + public static final TagInfoShort TIFF_TAG_PREDICTOR = new TagInfoShort( "Predictor", 0x13D, 1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); - int PREDICTOR_VALUE_NONE = 1; - int PREDICTOR_VALUE_HORIZONTAL_DIFFERENCING = 2; + public static final int PREDICTOR_VALUE_NONE = 1; + public static final int PREDICTOR_VALUE_HORIZONTAL_DIFFERENCING = 2; - TagInfoRational TIFF_TAG_WHITE_POINT = new TagInfoRational( + public static final TagInfoRational TIFF_TAG_WHITE_POINT = new TagInfoRational( "WhitePoint", 0x13E, 2, TiffDirectoryType.TIFF_DIRECTORY_ROOT); - TagInfoRational TIFF_TAG_PRIMARY_CHROMATICITIES = new TagInfoRational( + public static final TagInfoRational TIFF_TAG_PRIMARY_CHROMATICITIES = new TagInfoRational( "PrimaryChromaticities", 0x13F, 6, TiffDirectoryType.TIFF_DIRECTORY_ROOT); - TagInfoShort TIFF_TAG_COLOR_MAP = new TagInfoShort( + public static final TagInfoShort TIFF_TAG_COLOR_MAP = new TagInfoShort( "ColorMap", 0x140, -1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); - TagInfoShort TIFF_TAG_HALFTONE_HINTS = new TagInfoShort( + public static final TagInfoShort TIFF_TAG_HALFTONE_HINTS = new TagInfoShort( "HalftoneHints", 0x141, 2, TiffDirectoryType.TIFF_DIRECTORY_ROOT); - TagInfoShortOrLong TIFF_TAG_TILE_WIDTH = new TagInfoShortOrLong( + public static final TagInfoShortOrLong TIFF_TAG_TILE_WIDTH = new TagInfoShortOrLong( "TileWidth", 0x142, 1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); - TagInfoShortOrLong TIFF_TAG_TILE_LENGTH = new TagInfoShortOrLong( + public static final TagInfoShortOrLong TIFF_TAG_TILE_LENGTH = new TagInfoShortOrLong( "TileLength", 0x143, 1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); - TagInfoLong TIFF_TAG_TILE_OFFSETS = new TagInfoLong( + public static final TagInfoLong TIFF_TAG_TILE_OFFSETS = new TagInfoLong( "TileOffsets", 0x144, -1, TiffDirectoryType.TIFF_DIRECTORY_ROOT, true); - TagInfoShortOrLong TIFF_TAG_TILE_BYTE_COUNTS = new TagInfoShortOrLong( + public static final TagInfoShortOrLong TIFF_TAG_TILE_BYTE_COUNTS = new TagInfoShortOrLong( "TileByteCounts", 0x145, -1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); - TagInfoShort TIFF_TAG_INK_SET = new TagInfoShort( + public static final TagInfoShort TIFF_TAG_INK_SET = new TagInfoShort( "InkSet", 0x14C, 1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); - int INK_SET_VALUE_CMYK = 1; - int INK_SET_VALUE_NOT_CMYK = 2; + public static final int INK_SET_VALUE_CMYK = 1; + public static final int INK_SET_VALUE_NOT_CMYK = 2; - TagInfoAscii TIFF_TAG_INK_NAMES = new TagInfoAscii( + public static final TagInfoAscii TIFF_TAG_INK_NAMES = new TagInfoAscii( "InkNames", 0x14D, -1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); - TagInfoShort TIFF_TAG_NUMBER_OF_INKS = new TagInfoShort( + public static final TagInfoShort TIFF_TAG_NUMBER_OF_INKS = new TagInfoShort( "NumberOfInks", 0x14E, 1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); - TagInfoByteOrShort TIFF_TAG_DOT_RANGE = new TagInfoByteOrShort( + public static final TagInfoByteOrShort TIFF_TAG_DOT_RANGE = new TagInfoByteOrShort( "DotRange", 0x150, -1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); - TagInfoAscii TIFF_TAG_TARGET_PRINTER = new TagInfoAscii( + public static final TagInfoAscii TIFF_TAG_TARGET_PRINTER = new TagInfoAscii( "TargetPrinter", 0x151, -1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); - TagInfoShort TIFF_TAG_EXTRA_SAMPLES = new TagInfoShort( + public static final TagInfoShort TIFF_TAG_EXTRA_SAMPLES = new TagInfoShort( "ExtraSamples", 0x152, -1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); - TagInfoShort TIFF_TAG_SAMPLE_FORMAT = new TagInfoShort( + public static final TagInfoShort TIFF_TAG_SAMPLE_FORMAT = new TagInfoShort( "SampleFormat", 0x153, -1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); - int SAMPLE_FORMAT_VALUE_UNSIGNED_INTEGER = 1; - int SAMPLE_FORMAT_VALUE_TWOS_COMPLEMENT_SIGNED_INTEGER = 2; - int SAMPLE_FORMAT_VALUE_IEEE_FLOATING_POINT = 3; - int SAMPLE_FORMAT_VALUE_UNDEFINED = 4; - int SAMPLE_FORMAT_VALUE_COMPLEX_INTEGER = 5; - int SAMPLE_FORMAT_VALUE_IEEE_FLOATING_POINT_1 = 6; + public static final int SAMPLE_FORMAT_VALUE_UNSIGNED_INTEGER = 1; + public static final int SAMPLE_FORMAT_VALUE_TWOS_COMPLEMENT_SIGNED_INTEGER = 2; + public static final int SAMPLE_FORMAT_VALUE_IEEE_FLOATING_POINT = 3; + public static final int SAMPLE_FORMAT_VALUE_UNDEFINED = 4; + public static final int SAMPLE_FORMAT_VALUE_COMPLEX_INTEGER = 5; + public static final int SAMPLE_FORMAT_VALUE_IEEE_FLOATING_POINT_1 = 6; - TagInfoAny TIFF_TAG_SMIN_SAMPLE_VALUE = new TagInfoAny( + public static final TagInfoAny TIFF_TAG_SMIN_SAMPLE_VALUE = new TagInfoAny( "SMinSampleValue", 0x154, -1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); - TagInfoAny TIFF_TAG_SMAX_SAMPLE_VALUE = new TagInfoAny( + public static final TagInfoAny TIFF_TAG_SMAX_SAMPLE_VALUE = new TagInfoAny( "SMaxSampleValue", 0x155, -1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); - TagInfoShort TIFF_TAG_TRANSFER_RANGE = new TagInfoShort( + public static final TagInfoShort TIFF_TAG_TRANSFER_RANGE = new TagInfoShort( "TransferRange", 0x156, 6, TiffDirectoryType.TIFF_DIRECTORY_ROOT); - TagInfoShort TIFF_TAG_JPEG_PROC = new TagInfoShort( + public static final TagInfoShort TIFF_TAG_JPEG_PROC = new TagInfoShort( "JPEGProc", 0x200, 1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); - int JPEGPROC_VALUE_BASELINE = 1; - int JPEGPROC_VALUE_LOSSLESS = 14; + public static final int JPEGPROC_VALUE_BASELINE = 1; + public static final int JPEGPROC_VALUE_LOSSLESS = 14; - TagInfoLong TIFF_TAG_JPEG_INTERCHANGE_FORMAT = new TagInfoLong( + public static final TagInfoLong TIFF_TAG_JPEG_INTERCHANGE_FORMAT = new TagInfoLong( "JPEGInterchangeFormat", 0x201, 1, TiffDirectoryType.TIFF_DIRECTORY_ROOT, true); - TagInfoLong TIFF_TAG_JPEG_INTERCHANGE_FORMAT_LENGTH = new TagInfoLong( + public static final TagInfoLong TIFF_TAG_JPEG_INTERCHANGE_FORMAT_LENGTH = new TagInfoLong( "JPEGInterchangeFormatLength", 0x202, 1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); - TagInfoShort TIFF_TAG_JPEG_RESTART_INTERVAL = new TagInfoShort( + public static final TagInfoShort TIFF_TAG_JPEG_RESTART_INTERVAL = new TagInfoShort( "JPEGRestartInterval", 0x203, 1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); - TagInfoShort TIFF_TAG_JPEG_LOSSLESS_PREDICTORS = new TagInfoShort( + public static final TagInfoShort TIFF_TAG_JPEG_LOSSLESS_PREDICTORS = new TagInfoShort( "JPEGLosslessPredictors", 0x205, -1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); - TagInfoShort TIFF_TAG_JPEG_POINT_TRANSFORMS = new TagInfoShort( + public static final TagInfoShort TIFF_TAG_JPEG_POINT_TRANSFORMS = new TagInfoShort( "JPEGPointTransforms", 0x206, -1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); - TagInfoLong TIFF_TAG_JPEG_QTABLES = new TagInfoLong( + public static final TagInfoLong TIFF_TAG_JPEG_QTABLES = new TagInfoLong( "JPEGQTables", 0x207, -1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); - TagInfoLong TIFF_TAG_JPEG_DCTABLES = new TagInfoLong( + public static final TagInfoLong TIFF_TAG_JPEG_DCTABLES = new TagInfoLong( "JPEGDCTables", 0x208, -1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); - TagInfoLong TIFF_TAG_JPEG_ACTABLES = new TagInfoLong( + public static final TagInfoLong TIFF_TAG_JPEG_ACTABLES = new TagInfoLong( "JPEGACTables", 0x209, -1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); - TagInfoRational TIFF_TAG_YCBCR_COEFFICIENTS = new TagInfoRational( + public static final TagInfoRational TIFF_TAG_YCBCR_COEFFICIENTS = new TagInfoRational( "YCbCrCoefficients", 0x211, 3, TiffDirectoryType.TIFF_DIRECTORY_ROOT); - TagInfoShort TIFF_TAG_YCBCR_SUB_SAMPLING = new TagInfoShort( + public static final TagInfoShort TIFF_TAG_YCBCR_SUB_SAMPLING = new TagInfoShort( "YCbCrSubSampling", 0x212, 2, TiffDirectoryType.TIFF_DIRECTORY_ROOT); - TagInfoShort TIFF_TAG_YCBCR_POSITIONING = new TagInfoShort( + public static final TagInfoShort TIFF_TAG_YCBCR_POSITIONING = new TagInfoShort( "YCbCrPositioning", 0x213, 1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); - int YCB_CR_POSITIONING_VALUE_CENTERED = 1; - int YCB_CR_POSITIONING_VALUE_CO_SITED = 2; + public static final int YCB_CR_POSITIONING_VALUE_CENTERED = 1; + public static final int YCB_CR_POSITIONING_VALUE_CO_SITED = 2; - TagInfoLong TIFF_TAG_REFERENCE_BLACK_WHITE = new TagInfoLong( + public static final TagInfoLong TIFF_TAG_REFERENCE_BLACK_WHITE = new TagInfoLong( "ReferenceBlackWhite", 0x214, -1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); - TagInfoAscii TIFF_TAG_COPYRIGHT = new TagInfoAscii( + public static final TagInfoAscii TIFF_TAG_COPYRIGHT = new TagInfoAscii( "Copyright", 0x8298, -1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); - TagInfoByte TIFF_TAG_XMP = new TagInfoByte( + public static final TagInfoByte TIFF_TAG_XMP = new TagInfoByte( "XMP", 0x2BC, -1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); // TODO: - // TagInfo2 TIFF_TAG_UNKNOWN = null; - TagInfo TIFF_TAG_UNKNOWN = new TagInfoUnknown( + // public static final TagInfo2 TIFF_TAG_UNKNOWN = null; + public static final TagInfo TIFF_TAG_UNKNOWN = new TagInfoUnknown( "Unknown Tag", -1, TagInfo.LENGTH_UNKNOWN, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - List<TagInfo> ALL_TIFF_TAGS = + public static final List<TagInfo> ALL_TIFF_TAGS = Collections.unmodifiableList(Arrays.asList( TIFF_TAG_NEW_SUBFILE_TYPE, TIFF_TAG_SUBFILE_TYPE, TIFF_TAG_IMAGE_WIDTH, TIFF_TAG_IMAGE_LENGTH, @@ -471,4 +472,7 @@ public interface TiffTagConstants { TIFF_TAG_YCBCR_POSITIONING, TIFF_TAG_REFERENCE_BLACK_WHITE, TIFF_TAG_COPYRIGHT, TIFF_TAG_XMP)); + + private TiffTagConstants() { + } }
