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 2013/11/06 05:27:44 UTC

svn commit: r1539238 [3/3] - /commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/

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=1539238&r1=1539237&r2=1539238&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 Wed Nov  6 04:27:44 2013
@@ -37,405 +37,405 @@ import org.apache.commons.imaging.format
  * http://partners.adobe.com/public/developer/en/tiff/TIFF6.pdf
  */
 public interface TiffTagConstants {
-    public static final TagInfoLong TIFF_TAG_NEW_SUBFILE_TYPE = new TagInfoLong(
+    TagInfoLong TIFF_TAG_NEW_SUBFILE_TYPE = new TagInfoLong(
             "NewSubfileType", 0xFE, 1,
             TiffDirectoryType.TIFF_DIRECTORY_ROOT);
-    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;
+    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 TagInfoShort TIFF_TAG_SUBFILE_TYPE = new TagInfoShort(
+    TagInfoShort TIFF_TAG_SUBFILE_TYPE = new TagInfoShort(
             "SubfileType", 0xFF, 1,
             TiffDirectoryType.TIFF_DIRECTORY_ROOT);
-    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;
+    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 TagInfoShortOrLong TIFF_TAG_IMAGE_WIDTH = new TagInfoShortOrLong(
+    TagInfoShortOrLong TIFF_TAG_IMAGE_WIDTH = new TagInfoShortOrLong(
             "ImageWidth", 0x100, 1,
             TiffDirectoryType.TIFF_DIRECTORY_ROOT);
 
-    public static final TagInfoShortOrLong TIFF_TAG_IMAGE_LENGTH = new TagInfoShortOrLong(
+    TagInfoShortOrLong TIFF_TAG_IMAGE_LENGTH = new TagInfoShortOrLong(
             "ImageLength", 0x101, 1,
             TiffDirectoryType.TIFF_DIRECTORY_ROOT);
 
-    public static final TagInfoShort TIFF_TAG_BITS_PER_SAMPLE = new TagInfoShort(
+    TagInfoShort TIFF_TAG_BITS_PER_SAMPLE = new TagInfoShort(
             "BitsPerSample", 0x102, -1,
             TiffDirectoryType.TIFF_DIRECTORY_ROOT);
 
-    public static final TagInfoShort TIFF_TAG_COMPRESSION = new TagInfoShort(
+    TagInfoShort TIFF_TAG_COMPRESSION = new TagInfoShort(
             "Compression", 0x103, 1,
             TiffDirectoryType.TIFF_DIRECTORY_ROOT);
-    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;
+    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 TagInfoShort TIFF_TAG_PHOTOMETRIC_INTERPRETATION = new TagInfoShort(
+    TagInfoShort TIFF_TAG_PHOTOMETRIC_INTERPRETATION = new TagInfoShort(
             "PhotometricInterpretation", 0x106, 1,
             TiffDirectoryType.TIFF_DIRECTORY_ROOT);
-    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;
+    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 TagInfoShort TIFF_TAG_THRESHHOLDING = new TagInfoShort(
+    TagInfoShort TIFF_TAG_THRESHHOLDING = new TagInfoShort(
             "Threshholding", 0x107, 1,
             TiffDirectoryType.TIFF_DIRECTORY_ROOT);
-    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;
+    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 TagInfoShort TIFF_TAG_CELL_WIDTH = new TagInfoShort(
+    TagInfoShort TIFF_TAG_CELL_WIDTH = new TagInfoShort(
             "CellWidth", 0x108, 1,
             TiffDirectoryType.TIFF_DIRECTORY_ROOT);
 
-    public static final TagInfoShort TIFF_TAG_CELL_LENGTH = new TagInfoShort(
+    TagInfoShort TIFF_TAG_CELL_LENGTH = new TagInfoShort(
             "CellLength", 0x109, 1,
             TiffDirectoryType.TIFF_DIRECTORY_ROOT);
 
-    public static final TagInfoShort TIFF_TAG_FILL_ORDER = new TagInfoShort(
+    TagInfoShort TIFF_TAG_FILL_ORDER = new TagInfoShort(
             "FillOrder", 0x10A, 1,
             TiffDirectoryType.TIFF_DIRECTORY_ROOT);
-    public static final int FILL_ORDER_VALUE_NORMAL = 1;
-    public static final int FILL_ORDER_VALUE_REVERSED = 2;
+    int FILL_ORDER_VALUE_NORMAL = 1;
+    int FILL_ORDER_VALUE_REVERSED = 2;
 
-    public static final TagInfoAscii TIFF_TAG_DOCUMENT_NAME = new TagInfoAscii(
+    TagInfoAscii TIFF_TAG_DOCUMENT_NAME = new TagInfoAscii(
             "DocumentName", 0x10D, -1,
             TiffDirectoryType.TIFF_DIRECTORY_ROOT);
 
-    public static final TagInfoAscii TIFF_TAG_IMAGE_DESCRIPTION = new TagInfoAscii(
+    TagInfoAscii TIFF_TAG_IMAGE_DESCRIPTION = new TagInfoAscii(
             "ImageDescription", 0x10E, -1,
             TiffDirectoryType.TIFF_DIRECTORY_ROOT);
 
-    public static final TagInfoAscii TIFF_TAG_MAKE = new TagInfoAscii(
+    TagInfoAscii TIFF_TAG_MAKE = new TagInfoAscii(
             "Make", 0x10F, -1,
             TiffDirectoryType.TIFF_DIRECTORY_ROOT);
 
-    public static final TagInfoAscii TIFF_TAG_MODEL = new TagInfoAscii(
+    TagInfoAscii TIFF_TAG_MODEL = new TagInfoAscii(
             "Model", 0x110, -1,
             TiffDirectoryType.TIFF_DIRECTORY_ROOT);
 
-    public static final TagInfoShortOrLong TIFF_TAG_STRIP_OFFSETS = new TagInfoShortOrLong(
+    TagInfoShortOrLong TIFF_TAG_STRIP_OFFSETS = new TagInfoShortOrLong(
             "StripOffsets", 0x111, -1,
             TiffDirectoryType.TIFF_DIRECTORY_ROOT, true);
 
-    public static final TagInfoShort TIFF_TAG_ORIENTATION = new TagInfoShort(
+    TagInfoShort TIFF_TAG_ORIENTATION = new TagInfoShort(
             "Orientation", 0x112, 1,
             TiffDirectoryType.TIFF_DIRECTORY_ROOT);
-    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;
+    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 TagInfoShort TIFF_TAG_SAMPLES_PER_PIXEL = new TagInfoShort(
+    TagInfoShort TIFF_TAG_SAMPLES_PER_PIXEL = new TagInfoShort(
             "SamplesPerPixel", 0x115, 1,
             TiffDirectoryType.TIFF_DIRECTORY_ROOT);
 
-    public static final TagInfoShortOrLong TIFF_TAG_ROWS_PER_STRIP = new TagInfoShortOrLong(
+    TagInfoShortOrLong TIFF_TAG_ROWS_PER_STRIP = new TagInfoShortOrLong(
             "RowsPerStrip", 0x116, 1,
             TiffDirectoryType.TIFF_DIRECTORY_ROOT);
 
-    public static final TagInfoShortOrLong TIFF_TAG_STRIP_BYTE_COUNTS = new TagInfoShortOrLong(
+    TagInfoShortOrLong TIFF_TAG_STRIP_BYTE_COUNTS = new TagInfoShortOrLong(
             "StripByteCounts", 0x117, -1,
             TiffDirectoryType.TIFF_DIRECTORY_ROOT);
 
-    public static final TagInfoShort TIFF_TAG_MIN_SAMPLE_VALUE = new TagInfoShort(
+    TagInfoShort TIFF_TAG_MIN_SAMPLE_VALUE = new TagInfoShort(
             "MinSampleValue", 0x118, -1,
             TiffDirectoryType.TIFF_DIRECTORY_ROOT);
 
-    public static final TagInfoShort TIFF_TAG_MAX_SAMPLE_VALUE = new TagInfoShort(
+    TagInfoShort TIFF_TAG_MAX_SAMPLE_VALUE = new TagInfoShort(
             "MaxSampleValue", 0x119, -1,
             TiffDirectoryType.TIFF_DIRECTORY_ROOT);
 
-    public static final TagInfoRational TIFF_TAG_XRESOLUTION = new TagInfoRational(
+    TagInfoRational TIFF_TAG_XRESOLUTION = new TagInfoRational(
             "XResolution", 0x11A, 1,
             TiffDirectoryType.TIFF_DIRECTORY_ROOT);
 
-    public static final TagInfoRational TIFF_TAG_YRESOLUTION = new TagInfoRational(
+    TagInfoRational TIFF_TAG_YRESOLUTION = new TagInfoRational(
             "YResolution", 0x11B, 1,
             TiffDirectoryType.TIFF_DIRECTORY_ROOT);
 
-    public static final TagInfoShort TIFF_TAG_PLANAR_CONFIGURATION = new TagInfoShort(
+    TagInfoShort TIFF_TAG_PLANAR_CONFIGURATION = new TagInfoShort(
             "PlanarConfiguration", 0x11C, 1,
             TiffDirectoryType.TIFF_DIRECTORY_ROOT);
-    public static final int PLANAR_CONFIGURATION_VALUE_CHUNKY = 1;
-    public static final int PLANAR_CONFIGURATION_VALUE_PLANAR = 2;
+    int PLANAR_CONFIGURATION_VALUE_CHUNKY = 1;
+    int PLANAR_CONFIGURATION_VALUE_PLANAR = 2;
 
-    public static final TagInfoAscii TIFF_TAG_PAGE_NAME = new TagInfoAscii(
+    TagInfoAscii TIFF_TAG_PAGE_NAME = new TagInfoAscii(
             "PageName", 0x11D, -1,
             TiffDirectoryType.TIFF_DIRECTORY_ROOT);
 
-    public static final TagInfoRational TIFF_TAG_XPOSITION = new TagInfoRational(
+    TagInfoRational TIFF_TAG_XPOSITION = new TagInfoRational(
             "XPosition", 0x11E, -1,
             TiffDirectoryType.TIFF_DIRECTORY_ROOT);
 
-    public static final TagInfoRational TIFF_TAG_YPOSITION = new TagInfoRational(
+    TagInfoRational TIFF_TAG_YPOSITION = new TagInfoRational(
             "YPosition",  0x11F, -1,
             TiffDirectoryType.TIFF_DIRECTORY_ROOT);
 
-    public static final TagInfoLong TIFF_TAG_FREE_OFFSETS = new TagInfoLong(
+    TagInfoLong TIFF_TAG_FREE_OFFSETS = new TagInfoLong(
             "FreeOffsets", 0x120, -1,
             TiffDirectoryType.TIFF_DIRECTORY_ROOT);
 
-    public static final TagInfoLong TIFF_TAG_FREE_BYTE_COUNTS = new TagInfoLong(
+    TagInfoLong TIFF_TAG_FREE_BYTE_COUNTS = new TagInfoLong(
             "FreeByteCounts", 0x121, -1,
             TiffDirectoryType.TIFF_DIRECTORY_ROOT);
 
-    public static final TagInfoShort TIFF_TAG_GRAY_RESPONSE_UNIT = new TagInfoShort(
+    TagInfoShort TIFF_TAG_GRAY_RESPONSE_UNIT = new TagInfoShort(
             "GrayResponseUnit", 0x122, 1,
             TiffDirectoryType.TIFF_DIRECTORY_ROOT);
-    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;
+    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 TagInfoShort TIFF_TAG_GRAY_RESPONSE_CURVE = new TagInfoShort(
+    TagInfoShort TIFF_TAG_GRAY_RESPONSE_CURVE = new TagInfoShort(
             "GrayResponseCurve", 0x123, -1,
             TiffDirectoryType.TIFF_DIRECTORY_ROOT);
 
-    public static final TagInfoLong TIFF_TAG_T4_OPTIONS = new TagInfoLong(
+    TagInfoLong TIFF_TAG_T4_OPTIONS = new TagInfoLong(
             "T4Options", 0x124, 1,
             TiffDirectoryType.TIFF_DIRECTORY_ROOT);
 
-    public static final TagInfoLong TIFF_TAG_T6_OPTIONS = new TagInfoLong(
+    TagInfoLong TIFF_TAG_T6_OPTIONS = new TagInfoLong(
             "T6Options", 0x125, 1,
             TiffDirectoryType.TIFF_DIRECTORY_ROOT);
 
-    public static final TagInfoShort TIFF_TAG_RESOLUTION_UNIT = new TagInfoShort(
+    TagInfoShort TIFF_TAG_RESOLUTION_UNIT = new TagInfoShort(
             "ResolutionUnit", 0x128, 1,
             TiffDirectoryType.TIFF_DIRECTORY_ROOT);
-    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;
+    int RESOLUTION_UNIT_VALUE_NONE = 1;
+    int RESOLUTION_UNIT_VALUE_INCHES = 2;
+    int RESOLUTION_UNIT_VALUE_CM = 3;
 
-    public static final TagInfoShort TIFF_TAG_PAGE_NUMBER = new TagInfoShort(
+    TagInfoShort TIFF_TAG_PAGE_NUMBER = new TagInfoShort(
             "PageNumber", 0x129, 2,
             TiffDirectoryType.TIFF_DIRECTORY_ROOT);
 
-    public static final TagInfoShort TIFF_TAG_TRANSFER_FUNCTION = new TagInfoShort(
+    TagInfoShort TIFF_TAG_TRANSFER_FUNCTION = new TagInfoShort(
             "TransferFunction", 0x12D, -1,
             TiffDirectoryType.TIFF_DIRECTORY_ROOT);
 
-    public static final TagInfoAscii TIFF_TAG_SOFTWARE = new TagInfoAscii(
+    TagInfoAscii TIFF_TAG_SOFTWARE = new TagInfoAscii(
             "Software", 0x131, -1,
             TiffDirectoryType.TIFF_DIRECTORY_ROOT);
 
-    public static final TagInfoAscii TIFF_TAG_DATE_TIME = new TagInfoAscii(
+    TagInfoAscii TIFF_TAG_DATE_TIME = new TagInfoAscii(
             "DateTime", 0x132, 20,
             TiffDirectoryType.TIFF_DIRECTORY_ROOT);
 
-    public static final TagInfoAscii TIFF_TAG_ARTIST = new TagInfoAscii(
+    TagInfoAscii TIFF_TAG_ARTIST = new TagInfoAscii(
             "Artist", 0x13B, -1,
             TiffDirectoryType.TIFF_DIRECTORY_ROOT);
 
-    public static final TagInfoAscii TIFF_TAG_HOST_COMPUTER = new TagInfoAscii(
+    TagInfoAscii TIFF_TAG_HOST_COMPUTER = new TagInfoAscii(
             "HostComputer", 0x13C, -1,
             TiffDirectoryType.TIFF_DIRECTORY_ROOT);
 
-    public static final TagInfoShort TIFF_TAG_PREDICTOR = new TagInfoShort(
+    TagInfoShort TIFF_TAG_PREDICTOR = new TagInfoShort(
             "Predictor", 0x13D, 1,
             TiffDirectoryType.TIFF_DIRECTORY_ROOT);
-    public static final int PREDICTOR_VALUE_NONE = 1;
-    public static final int PREDICTOR_VALUE_HORIZONTAL_DIFFERENCING = 2;
+    int PREDICTOR_VALUE_NONE = 1;
+    int PREDICTOR_VALUE_HORIZONTAL_DIFFERENCING = 2;
 
-    public static final TagInfoRational TIFF_TAG_WHITE_POINT = new TagInfoRational(
+    TagInfoRational TIFF_TAG_WHITE_POINT = new TagInfoRational(
             "WhitePoint", 0x13E, 2,
             TiffDirectoryType.TIFF_DIRECTORY_ROOT);
 
-    public static final TagInfoRational TIFF_TAG_PRIMARY_CHROMATICITIES = new TagInfoRational(
+    TagInfoRational TIFF_TAG_PRIMARY_CHROMATICITIES = new TagInfoRational(
             "PrimaryChromaticities", 0x13F, 6,
             TiffDirectoryType.TIFF_DIRECTORY_ROOT);
 
-    public static final TagInfoShort TIFF_TAG_COLOR_MAP = new TagInfoShort(
+    TagInfoShort TIFF_TAG_COLOR_MAP = new TagInfoShort(
             "ColorMap", 0x140, -1,
             TiffDirectoryType.TIFF_DIRECTORY_ROOT);
 
-    public static final TagInfoShort TIFF_TAG_HALFTONE_HINTS = new TagInfoShort(
+    TagInfoShort TIFF_TAG_HALFTONE_HINTS = new TagInfoShort(
             "HalftoneHints", 0x141, 2,
             TiffDirectoryType.TIFF_DIRECTORY_ROOT);
 
-    public static final TagInfoShortOrLong TIFF_TAG_TILE_WIDTH = new TagInfoShortOrLong(
+    TagInfoShortOrLong TIFF_TAG_TILE_WIDTH = new TagInfoShortOrLong(
             "TileWidth", 0x142, 1,
             TiffDirectoryType.TIFF_DIRECTORY_ROOT);
 
-    public static final TagInfoShortOrLong TIFF_TAG_TILE_LENGTH = new TagInfoShortOrLong(
+    TagInfoShortOrLong TIFF_TAG_TILE_LENGTH = new TagInfoShortOrLong(
             "TileLength", 0x143, 1,
             TiffDirectoryType.TIFF_DIRECTORY_ROOT);
 
-    public static final TagInfoLong TIFF_TAG_TILE_OFFSETS = new TagInfoLong(
+    TagInfoLong TIFF_TAG_TILE_OFFSETS = new TagInfoLong(
             "TileOffsets", 0x144, -1,
             TiffDirectoryType.TIFF_DIRECTORY_ROOT, true);
 
-    public static final TagInfoShortOrLong TIFF_TAG_TILE_BYTE_COUNTS = new TagInfoShortOrLong(
+    TagInfoShortOrLong TIFF_TAG_TILE_BYTE_COUNTS = new TagInfoShortOrLong(
             "TileByteCounts", 0x145, -1,
             TiffDirectoryType.TIFF_DIRECTORY_ROOT);
 
-    public static final TagInfoShort TIFF_TAG_INK_SET = new TagInfoShort(
+    TagInfoShort TIFF_TAG_INK_SET = new TagInfoShort(
             "InkSet", 0x14C, 1,
             TiffDirectoryType.TIFF_DIRECTORY_ROOT);
-    public static final int INK_SET_VALUE_CMYK = 1;
-    public static final int INK_SET_VALUE_NOT_CMYK = 2;
+    int INK_SET_VALUE_CMYK = 1;
+    int INK_SET_VALUE_NOT_CMYK = 2;
 
-    public static final TagInfoAscii TIFF_TAG_INK_NAMES = new TagInfoAscii(
+    TagInfoAscii TIFF_TAG_INK_NAMES = new TagInfoAscii(
             "InkNames", 0x14D, -1,
             TiffDirectoryType.TIFF_DIRECTORY_ROOT);
 
-    public static final TagInfoShort TIFF_TAG_NUMBER_OF_INKS = new TagInfoShort(
+    TagInfoShort TIFF_TAG_NUMBER_OF_INKS = new TagInfoShort(
             "NumberOfInks", 0x14E, 1,
             TiffDirectoryType.TIFF_DIRECTORY_ROOT);
 
-    public static final TagInfoByteOrShort TIFF_TAG_DOT_RANGE = new TagInfoByteOrShort(
+    TagInfoByteOrShort TIFF_TAG_DOT_RANGE = new TagInfoByteOrShort(
             "DotRange", 0x150, -1,
             TiffDirectoryType.TIFF_DIRECTORY_ROOT);
 
-    public static final TagInfoAscii TIFF_TAG_TARGET_PRINTER = new TagInfoAscii(
+    TagInfoAscii TIFF_TAG_TARGET_PRINTER = new TagInfoAscii(
             "TargetPrinter", 0x151, -1,
             TiffDirectoryType.TIFF_DIRECTORY_ROOT);
 
-    public static final TagInfoShort TIFF_TAG_EXTRA_SAMPLES = new TagInfoShort(
+    TagInfoShort TIFF_TAG_EXTRA_SAMPLES = new TagInfoShort(
             "ExtraSamples", 0x152, -1,
             TiffDirectoryType.TIFF_DIRECTORY_ROOT);
 
-    public static final TagInfoShort TIFF_TAG_SAMPLE_FORMAT = new TagInfoShort(
+    TagInfoShort TIFF_TAG_SAMPLE_FORMAT = new TagInfoShort(
             "SampleFormat", 0x153, -1,
             TiffDirectoryType.TIFF_DIRECTORY_ROOT);
-    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;
+    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 TagInfoAny TIFF_TAG_SMIN_SAMPLE_VALUE = new TagInfoAny(
+    TagInfoAny TIFF_TAG_SMIN_SAMPLE_VALUE = new TagInfoAny(
             "SMinSampleValue", 0x154, -1,
             TiffDirectoryType.TIFF_DIRECTORY_ROOT);
 
-    public static final TagInfoAny TIFF_TAG_SMAX_SAMPLE_VALUE = new TagInfoAny(
+    TagInfoAny TIFF_TAG_SMAX_SAMPLE_VALUE = new TagInfoAny(
             "SMaxSampleValue", 0x155, -1,
             TiffDirectoryType.TIFF_DIRECTORY_ROOT);
 
-    public static final TagInfoShort TIFF_TAG_TRANSFER_RANGE = new TagInfoShort(
+    TagInfoShort TIFF_TAG_TRANSFER_RANGE = new TagInfoShort(
             "TransferRange", 0x156, 6,
             TiffDirectoryType.TIFF_DIRECTORY_ROOT);
 
-    public static final TagInfoShort TIFF_TAG_JPEG_PROC = new TagInfoShort(
+    TagInfoShort TIFF_TAG_JPEG_PROC = new TagInfoShort(
             "JPEGProc", 0x200, 1,
             TiffDirectoryType.TIFF_DIRECTORY_ROOT);
-    public static final int JPEGPROC_VALUE_BASELINE = 1;
-    public static final int JPEGPROC_VALUE_LOSSLESS = 14;
+    int JPEGPROC_VALUE_BASELINE = 1;
+    int JPEGPROC_VALUE_LOSSLESS = 14;
 
-    public static final TagInfoLong TIFF_TAG_JPEG_INTERCHANGE_FORMAT = new TagInfoLong(
+    TagInfoLong TIFF_TAG_JPEG_INTERCHANGE_FORMAT = new TagInfoLong(
             "JPEGInterchangeFormat", 0x201, 1,
             TiffDirectoryType.TIFF_DIRECTORY_ROOT, true);
 
-    public static final TagInfoLong TIFF_TAG_JPEG_INTERCHANGE_FORMAT_LENGTH = new TagInfoLong(
+    TagInfoLong TIFF_TAG_JPEG_INTERCHANGE_FORMAT_LENGTH = new TagInfoLong(
             "JPEGInterchangeFormatLength", 0x202,
             1, TiffDirectoryType.TIFF_DIRECTORY_ROOT);
 
-    public static final TagInfoShort TIFF_TAG_JPEG_RESTART_INTERVAL = new TagInfoShort(
+    TagInfoShort TIFF_TAG_JPEG_RESTART_INTERVAL = new TagInfoShort(
             "JPEGRestartInterval", 0x203, 1,
             TiffDirectoryType.TIFF_DIRECTORY_ROOT);
 
-    public static final TagInfoShort TIFF_TAG_JPEG_LOSSLESS_PREDICTORS = new TagInfoShort(
+    TagInfoShort TIFF_TAG_JPEG_LOSSLESS_PREDICTORS = new TagInfoShort(
             "JPEGLosslessPredictors", 0x205, -1,
             TiffDirectoryType.TIFF_DIRECTORY_ROOT);
 
-    public static final TagInfoShort TIFF_TAG_JPEG_POINT_TRANSFORMS = new TagInfoShort(
+    TagInfoShort TIFF_TAG_JPEG_POINT_TRANSFORMS = new TagInfoShort(
             "JPEGPointTransforms", 0x206, -1,
             TiffDirectoryType.TIFF_DIRECTORY_ROOT);
 
-    public static final TagInfoLong TIFF_TAG_JPEG_QTABLES = new TagInfoLong(
+    TagInfoLong TIFF_TAG_JPEG_QTABLES = new TagInfoLong(
             "JPEGQTables", 0x207, -1,
             TiffDirectoryType.TIFF_DIRECTORY_ROOT);
 
-    public static final TagInfoLong TIFF_TAG_JPEG_DCTABLES = new TagInfoLong(
+    TagInfoLong TIFF_TAG_JPEG_DCTABLES = new TagInfoLong(
             "JPEGDCTables", 0x208, -1,
             TiffDirectoryType.TIFF_DIRECTORY_ROOT);
 
-    public static final TagInfoLong TIFF_TAG_JPEG_ACTABLES = new TagInfoLong(
+    TagInfoLong TIFF_TAG_JPEG_ACTABLES = new TagInfoLong(
             "JPEGACTables", 0x209, -1,
             TiffDirectoryType.TIFF_DIRECTORY_ROOT);
 
-    public static final TagInfoRational TIFF_TAG_YCBCR_COEFFICIENTS = new TagInfoRational(
+    TagInfoRational TIFF_TAG_YCBCR_COEFFICIENTS = new TagInfoRational(
             "YCbCrCoefficients", 0x211, 3,
             TiffDirectoryType.TIFF_DIRECTORY_ROOT);
 
-    public static final TagInfoShort TIFF_TAG_YCBCR_SUB_SAMPLING = new TagInfoShort(
+    TagInfoShort TIFF_TAG_YCBCR_SUB_SAMPLING = new TagInfoShort(
             "YCbCrSubSampling", 0x212, 2,
             TiffDirectoryType.TIFF_DIRECTORY_ROOT);
 
-    public static final TagInfoShort TIFF_TAG_YCBCR_POSITIONING = new TagInfoShort(
+    TagInfoShort TIFF_TAG_YCBCR_POSITIONING = new TagInfoShort(
             "YCbCrPositioning", 0x213, 1,
             TiffDirectoryType.TIFF_DIRECTORY_ROOT);
-    public static final int YCB_CR_POSITIONING_VALUE_CENTERED = 1;
-    public static final int YCB_CR_POSITIONING_VALUE_CO_SITED = 2;
+    int YCB_CR_POSITIONING_VALUE_CENTERED = 1;
+    int YCB_CR_POSITIONING_VALUE_CO_SITED = 2;
 
-    public static final TagInfoLong TIFF_TAG_REFERENCE_BLACK_WHITE = new TagInfoLong(
+    TagInfoLong TIFF_TAG_REFERENCE_BLACK_WHITE = new TagInfoLong(
             "ReferenceBlackWhite", 0x214, -1,
             TiffDirectoryType.TIFF_DIRECTORY_ROOT);
 
-    public static final TagInfoAscii TIFF_TAG_COPYRIGHT = new TagInfoAscii(
+    TagInfoAscii TIFF_TAG_COPYRIGHT = new TagInfoAscii(
             "Copyright", 0x8298, -1,
             TiffDirectoryType.TIFF_DIRECTORY_ROOT);
 
-    public static final TagInfoByte TIFF_TAG_XMP = new TagInfoByte(
+    TagInfoByte TIFF_TAG_XMP = new TagInfoByte(
             "XMP", 0x2BC, -1,
             TiffDirectoryType.TIFF_DIRECTORY_ROOT);
 
     // TODO:
-    //    public static final TagInfo2 TIFF_TAG_UNKNOWN = null;
-    public static final TagInfo TIFF_TAG_UNKNOWN = new TagInfoUnknown(
+    //    TagInfo2 TIFF_TAG_UNKNOWN = null;
+    TagInfo TIFF_TAG_UNKNOWN = new TagInfoUnknown(
             "Unknown Tag", -1, TagInfo.LENGTH_UNKNOWN,
             TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
 
-    public static final List<TagInfo> ALL_TIFF_TAGS =
+    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,

Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/WangTagConstants.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/WangTagConstants.java?rev=1539238&r1=1539237&r2=1539238&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/WangTagConstants.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/WangTagConstants.java Wed Nov  6 04:27:44 2013
@@ -28,11 +28,11 @@ import org.apache.commons.imaging.format
  * undocumented and in need of more work.
  */
 public interface WangTagConstants {
-    public static final TagInfoByte EXIF_TAG_WANG_ANNOTATION = new TagInfoByte(
+    TagInfoByte EXIF_TAG_WANG_ANNOTATION = new TagInfoByte(
             "WangAnnotation", 0x80a4, -1,
             TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
 
-    public static final List<TagInfo> ALL_WANG_TAGS =
+    List<TagInfo> ALL_WANG_TAGS =
             Collections.unmodifiableList(Arrays.asList(new TagInfo[] {
                     EXIF_TAG_WANG_ANNOTATION }));
 }