Return-Path: X-Original-To: apmail-commons-commits-archive@minotaur.apache.org Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 71C26DAEE for ; Wed, 4 Jul 2012 04:21:33 +0000 (UTC) Received: (qmail 75967 invoked by uid 500); 4 Jul 2012 04:21:32 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 75781 invoked by uid 500); 4 Jul 2012 04:21:31 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 75738 invoked by uid 99); 4 Jul 2012 04:21:29 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Jul 2012 04:21:29 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,FRT_PROFIT2 X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Jul 2012 04:21:27 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 771FE23889BF for ; Wed, 4 Jul 2012 04:21:07 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1357065 [2/2] - in /commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff: ./ constants/ Date: Wed, 04 Jul 2012 04:21:05 -0000 To: commits@commons.apache.org From: damjan@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120704042107.771FE23889BF@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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=1357065&r1=1357064&r2=1357065&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 Wed Jul 4 04:21:03 2012 @@ -37,7 +37,7 @@ public interface MicrosoftHdPhotoTagCons * Data4 (char[8]) is endian-independent. */ public static final TagInfoByte EXIF_TAG_PIXEL_FORMAT = new TagInfoByte( - "Pixel Format", 0xbc01, 16, + "PixelFormat", 0xbc01, 16, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final BinaryConstant PIXEL_FORMAT_VALUE_BLACK_AND_WHITE = TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte)0x05); @@ -168,45 +168,46 @@ public interface MicrosoftHdPhotoTagCons public static final int UNCOMPRESSED_VALUE_NO = 0; public static final int UNCOMPRESSED_VALUE_YES = 1; - public static final TagInfoLong EXIF_TAG_IMAGE_TYPE = new TagInfoLong("Image Type", - 0xbc04, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); + public static final TagInfoLong EXIF_TAG_IMAGE_TYPE = new TagInfoLong( + "ImageType", 0xbc04, 1, + TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoLong EXIF_TAG_IMAGE_WIDTH = new TagInfoLong( - "Image Width", 0xbc80, 1, + "ImageWidth", 0xbc80, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoLong EXIF_TAG_IMAGE_HEIGHT = new TagInfoLong( - "Image Height", 0xbc81, 1, + "ImageHeight", 0xbc81, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoFloat EXIF_TAG_WIDTH_RESOLUTION = new TagInfoFloat( - "Width Resolution", 0xbc82, 1, + "WidthResolution", 0xbc82, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoFloat EXIF_TAG_HEIGHT_RESOLUTION = new TagInfoFloat( - "Height Resolution", 0xbc83, 1, + "HeightResolution", 0xbc83, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); // FIXME: might be an offset? public static final TagInfoLong EXIF_TAG_IMAGE_OFFSET = new TagInfoLong( - "Image Offset", 0xbcc0, 1, + "ImageOffset", 0xbcc0, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoLong EXIF_TAG_IMAGE_BYTE_COUNT = new TagInfoLong( - "Image Byte Count", 0xbcc1, 1, + "ImageByteCount", 0xbcc1, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); // FIXME: might be an offset? public static final TagInfoLong EXIF_TAG_ALPHA_OFFSET = new TagInfoLong( - "Alpha Offset", 0xbcc2, 1, + "AlphaOffset", 0xbcc2, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoLong EXIF_TAG_ALPHA_BYTE_COUNT = new TagInfoLong( - "Alpha Byte Count", 0xbcc3, 1, + "AlphaByteCount", 0xbcc3, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoByte EXIF_TAG_IMAGE_DATA_DISCARD = new TagInfoByte( - "Image Data Discard", 0xbcc4, 1, + "ImageDataDiscard", 0xbcc4, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final int IMAGE_DATA_DISCARD_VALUE_FULL_RESOLUTION = 0; public static final int IMAGE_DATA_DISCARD_VALUE_FLEXBITS_DISCARDED = 1; @@ -214,7 +215,7 @@ public interface MicrosoftHdPhotoTagCons public static final int IMAGE_DATA_DISCARD_VALUE_HIGHPASS_AND_LOW_PASS_FREQUENCY_DATA_DISCARDED = 3; public static final TagInfoByte EXIF_TAG_ALPHA_DATA_DISCARD = new TagInfoByte( - "Alpha Data Discard", 0xbcc5, 1, + "AlphaDataDiscard", 0xbcc5, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final int ALPHA_DATA_DISCARD_VALUE_FULL_RESOLUTION = 0; public static final int ALPHA_DATA_DISCARD_VALUE_FLEXBITS_DISCARDED = 1; 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=1357065&r1=1357064&r2=1357065&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 Wed Jul 4 04:21:03 2012 @@ -33,7 +33,7 @@ public interface MicrosoftTagConstants { TiffDirectoryType.EXIF_DIRECTORY_IFD0); public static final TagInfoShort EXIF_TAG_RATING_PERCENT = new TagInfoShort( - "Rating Percent", 0x4749, 1, + "RatingPercent", 0x4749, 1, TiffDirectoryType.EXIF_DIRECTORY_IFD0); public static final TagInfoXpString EXIF_TAG_XPTITLE = new TagInfoXpString( 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=1357065&r1=1357064&r2=1357065&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 Wed Jul 4 04:21:03 2012 @@ -32,46 +32,46 @@ import org.apache.commons.imaging.format * http://www.awaresystems.be/imaging/tiff/tifftags/docs/gel.html */ public interface MolecularDynamicsGelTagConstants extends TiffFieldTypeConstants { - public static final TagInfoLong EXIF_TAG_MDFILE_TAG = new TagInfoLong( - "MDFile Tag", 0x82a5, 1, + public static final TagInfoLong EXIF_TAG_MD_FILE_TAG = new TagInfoLong( + "MD FileTag", 0x82a5, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - public static final TagInfoRational EXIF_TAG_MDSCALE_PIXEL = new TagInfoRational( - "MDScale Pixel", 0x82a6, 1, + public static final TagInfoRational EXIF_TAG_MD_SCALE_PIXEL = new TagInfoRational( + "MD ScalePixel", 0x82a6, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - public static final TagInfoShort EXIF_TAG_MDCOLOR_TABLE = new TagInfoShort( - "MDColor Table", 0x82a7, -1, + public static final TagInfoShort EXIF_TAG_MD_COLOR_TABLE = new TagInfoShort( + "MD ColorTable", 0x82a7, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - public static final TagInfoAscii EXIF_TAG_MDLAB_NAME = new TagInfoAscii( - "MDLab Name", 0x82a8, -1, + public static final TagInfoAscii EXIF_TAG_MD_LAB_NAME = new TagInfoAscii( + "MD LabName", 0x82a8, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - public static final TagInfoAscii EXIF_TAG_MDSAMPLE_INFO = new TagInfoAscii( - "MDSample Info", 0x82a9, -1, + public static final TagInfoAscii EXIF_TAG_MD_SAMPLE_INFO = new TagInfoAscii( + "MD SampleInfo", 0x82a9, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - public static final TagInfoAscii EXIF_TAG_MDPREP_DATE = new TagInfoAscii( - "MDPrep Date", 0x82aa, -1, + public static final TagInfoAscii EXIF_TAG_MD_PREP_DATE = new TagInfoAscii( + "MD PrepDate", 0x82aa, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - public static final TagInfoAscii EXIF_TAG_MDPREP_TIME = new TagInfoAscii( - "MDPrep Time", 0x82ab, -1, + public static final TagInfoAscii EXIF_TAG_MD_PREP_TIME = new TagInfoAscii( + "MD PrepTime", 0x82ab, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - public static final TagInfoAscii EXIF_TAG_MDFILE_UNITS = new TagInfoAscii( - "MDFile Units", 0x82ac, -1, + public static final TagInfoAscii EXIF_TAG_MD_FILE_UNITS = new TagInfoAscii( + "MD FileUnits", 0x82ac, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final List ALL_MOLECULAR_DYNAMICS_GEL_TAGS = Collections.unmodifiableList(Arrays.asList( - EXIF_TAG_MDFILE_TAG, - EXIF_TAG_MDSCALE_PIXEL, - EXIF_TAG_MDCOLOR_TABLE, - EXIF_TAG_MDLAB_NAME, - EXIF_TAG_MDSAMPLE_INFO, - EXIF_TAG_MDPREP_DATE, - EXIF_TAG_MDPREP_TIME, - EXIF_TAG_MDFILE_UNITS)); + EXIF_TAG_MD_FILE_TAG, + EXIF_TAG_MD_SCALE_PIXEL, + EXIF_TAG_MD_COLOR_TABLE, + EXIF_TAG_MD_LAB_NAME, + EXIF_TAG_MD_SAMPLE_INFO, + EXIF_TAG_MD_PREP_DATE, + EXIF_TAG_MD_PREP_TIME, + EXIF_TAG_MD_FILE_UNITS)); } 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=1357065&r1=1357064&r2=1357065&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 Wed Jul 4 04:21:03 2012 @@ -29,26 +29,26 @@ import org.apache.commons.imaging.format * http://www.awaresystems.be/imaging/tiff/tifftags/docs/oce.html */ public interface OceScanjobTagConstants { - public static final TagInfoAscii EXIF_TAG_OCE_SCANJOB_DESC = new TagInfoAscii( - "Oce Scanjob Desc", 0xc427, -1, + public static final TagInfoAscii EXIF_TAG_OCE_SCANJOB_DESCRIPTION = new TagInfoAscii( + "Oce Scanjob Description", 0xc427, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoAscii EXIF_TAG_OCE_APPLICATION_SELECTOR = new TagInfoAscii( - "Oce Application Selector", 0xc428, - -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); + "Oce Application Selector", 0xc428, -1, + TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - public static final TagInfoAscii EXIF_TAG_OCE_IDNUMBER = new TagInfoAscii( - "Oce IDNumber", 0xc429, -1, + public static final TagInfoAscii EXIF_TAG_OCE_IDENTIFICATION_NUMBER = new TagInfoAscii( + "Oce Identification Number", 0xc429, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - public static final TagInfoAscii EXIF_TAG_OCE_IMAGE_LOGIC = new TagInfoAscii( - "Oce Image Logic", 0xc42a, -1, + public static final TagInfoAscii EXIF_TAG_OCE_IMAGE_LOGIC_CHARACTERISTICS = new TagInfoAscii( + "Oce ImageLogic Characteristics", 0xc42a, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final List ALL_OCE_SCANJOB_TAGS = Collections.unmodifiableList(Arrays.asList(new TagInfo[] { - EXIF_TAG_OCE_SCANJOB_DESC, + EXIF_TAG_OCE_SCANJOB_DESCRIPTION, EXIF_TAG_OCE_APPLICATION_SELECTOR, - EXIF_TAG_OCE_IDNUMBER, - EXIF_TAG_OCE_IMAGE_LOGIC})); + EXIF_TAG_OCE_IDENTIFICATION_NUMBER, + EXIF_TAG_OCE_IMAGE_LOGIC_CHARACTERISTICS})); } 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=1357065&r1=1357064&r2=1357065&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 Wed Jul 4 04:21:03 2012 @@ -38,32 +38,32 @@ import org.apache.commons.imaging.format */ public interface Rfc2301TagConstants extends TiffFieldTypeConstants { public static final TagInfoShortOrLong TIFF_TAG_BAD_FAX_LINES = new TagInfoShortOrLong( - "Bad Fax Lines", 0x0146, 1, + "BadFaxLines", 0x0146, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoShort TIFF_TAG_CLEAN_FAX_DATA = new TagInfoShort( - "Clean Fax Data", 0x0147, 1, + "CleanFaxData", 0x0147, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); 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; public static final TagInfoShortOrLong TIFF_TAG_CONSECUTIVE_BAD_FAX_LINES = new TagInfoShortOrLong( - "Consecutive Bad Fax Lines", 0x0148, 1, + "ConsecutiveBadFaxLines", 0x0148, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoLong TIFF_TAG_GLOBAL_PARAMETERS_IFD = new TagInfoLong( - "Global Parameters IFD", 0x0190, 1, + "GlobalParametersIFD", 0x0190, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN, true); public static final TagInfoLong TIFF_TAG_PROFILE_TYPE = new TagInfoLong( - "Profile Type", 0x0191, 1, + "ProfileType", 0x0191, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final int PROFILE_TYPE_VALUE_UNSPECIFIED = 0; public static final int PROFILE_TYPE_VALUE_GROUP_3_FAX = 1; public static final TagInfoByte TIFF_TAG_FAX_PROFILE = new TagInfoByte( - "Fax Profile", 0x0192, 1, + "FaxProfile", 0x0192, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final int FAX_PROFILE_VALUE_UNKNOWN = 0; public static final int FAX_PROFILE_VALUE_MINIMAL_B_AND_W_LOSSLESS_S = 1; @@ -74,7 +74,7 @@ public interface Rfc2301TagConstants ext public static final int FAX_PROFILE_VALUE_MIXED_RASTER_CONTENT_M = 6; public static final TagInfoLong TIFF_TAG_CODING_METHODS = new TagInfoLong( - "Coding Methods", 0x0193, 1, + "CodingMethods", 0x0193, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final int CODING_METHODS_VALUE_T4_1D = 2; public static final int CODING_METHODS_VALUE_T4_2D = 4; @@ -84,11 +84,11 @@ public interface Rfc2301TagConstants ext public static final int CODING_METHODS_VALUE_T82_T43 = 64; public static final TagInfoByte TIFF_TAG_VERSION_YEAR = new TagInfoByte( - "Version Year", 0x0194, 4, + "VersionYear", 0x0194, 4, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoByte TIFF_TAG_MODE_NUMBER = new TagInfoByte( - "Mode Number", 0x0195, 1, + "ModeNumber", 0x0195, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoRational TIFF_TAG_DECODE = new TagInfoRational( @@ -96,15 +96,15 @@ public interface Rfc2301TagConstants ext TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoShort TIFF_TAG_DEFAULT_IMAGE_COLOR = new TagInfoShort( - "Default Image Color", 0x01b2, -1, + "DefaultImageColor", 0x01b2, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoLong TIFF_TAG_STRIP_ROW_COUNTS = new TagInfoLong( - "Strip Row Counts", 0x022f, -1, + "StripRowCounts", 0x022f, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoShortOrLong TIFF_TAG_IMAGE_LAYER = new TagInfoShortOrLong( - "Image Layer", 0x87ac, 2, + "ImageLayer", 0x87ac, 2, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final List ALL_RFC_2301_TAGS = 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=1357065&r1=1357064&r2=1357065&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 Wed Jul 4 04:21:03 2012 @@ -30,7 +30,7 @@ import org.apache.commons.imaging.format */ public interface Tiff4TagConstants { public static final TagInfoShort TIFF_TAG_COLOR_RESPONSE_UNIT = new TagInfoShort( - "Color Response Unit", 0x12C, 1, + "ColorResponseUnit", 0x12C, 1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); public static final int COLOR_RESPONSE_UNIT_VALUE_0_1 = 1; public static final int COLOR_RESPONSE_UNIT_VALUE_0_01 = 2; 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=1357065&r1=1357064&r2=1357065&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 Wed Jul 4 04:21:03 2012 @@ -35,19 +35,19 @@ import org.apache.commons.imaging.format */ public interface TiffEpTagConstants extends TiffFieldTypeConstants { public static final TagInfoShort EXIF_TAG_CFAREPEAT_PATTERN_DIM = new TagInfoShort( - "CFARepeat Pattern Dim", 0x828d, 2, + "CFARepeatPatternDim", 0x828d, 2, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoByte EXIF_TAG_CFAPATTERN_2 = new TagInfoByte( - "CFAPattern 2", 0x828e, -1, + "CFAPattern2", 0x828e, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoAsciiOrRational EXIF_TAG_BATTERY_LEVEL = new TagInfoAsciiOrRational( - "Battery Level", 0x828f, -1, + "BatteryLevel", 0x828f, -1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); - public static final TagInfoUndefined EXIF_TAG_ICC_PROFILE = new TagInfoUndefined( - "ICC_Profile", 0x8773, -1, + public static final TagInfoUndefined EXIF_TAG_INTER_COLOR_PROFILE = new TagInfoUndefined( + "InterColorProfile", 0x8773, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoShort EXIF_TAG_INTERLACE = new TagInfoShort( @@ -55,19 +55,19 @@ public interface TiffEpTagConstants exte TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoSShort EXIF_TAG_TIME_ZONE_OFFSET = new TagInfoSShort( - "Time Zone Offset", 0x882a, -1, + "TimeZoneOffset", 0x882a, -1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); public static final TagInfoShort EXIF_TAG_SELF_TIMER_MODE = new TagInfoShort( - "Self Timer Mode", 0x882b, 1, + "SelfTimerMode", 0x882b, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); public static final TagInfoRational EXIF_TAG_FLASH_ENERGY = new TagInfoRational( - "Flash Energy", 0x920b, -1, + "FlashEnergy", 0x920b, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoUndefined EXIF_TAG_SPATIAL_FREQUENCY_RESPONSE_1 = new TagInfoUndefined( - "Spatial Frequency Response", 0x920c, -1, + "SpatialFrequencyResponse", 0x920c, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoUndefined EXIF_TAG_NOISE_1 = new TagInfoUndefined( @@ -75,15 +75,15 @@ public interface TiffEpTagConstants exte TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoRational EXIF_TAG_FOCAL_PLANE_XRESOLUTION = new TagInfoRational( - "Focal Plane XResolution", 0x920e, 1, + "FocalPlaneXResolution", 0x920e, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoRational EXIF_TAG_FOCAL_PLANE_YRESOLUTION = new TagInfoRational( - "Focal Plane YResolution", 0x920f, 1, + "FocalPlaneYResolution", 0x920f, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoShort EXIF_TAG_FOCAL_PLANE_RESOLUTION_UNIT = new TagInfoShort( - "Focal Plane Resolution Unit", 0x9210, 1, + "FocalPlaneResolutionUnit", 0x9210, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final int FOCAL_PLANE_RESOLUTION_UNIT_VALUE_NONE = 1; public static final int FOCAL_PLANE_RESOLUTION_UNIT_VALUE_INCHES = 2; @@ -92,27 +92,27 @@ public interface TiffEpTagConstants exte public static final int FOCAL_PLANE_RESOLUTION_UNIT_VALUE_UM = 5; public static final TagInfoLong EXIF_TAG_IMAGE_NUMBER_EXIF_IFD = new TagInfoLong( - "Image Number", 0x9211, 1, + "ImageNumber", 0x9211, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); public static final TagInfoAscii EXIF_TAG_SECURITY_CLASSIFICATION_EXIF_IFD = new TagInfoAscii( - "Security Classification", 0x9212, -1, + "SecurityClassification", 0x9212, -1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); public static final TagInfoAscii EXIF_TAG_IMAGE_HISTORY_EXIF_IFD = new TagInfoAscii( - "Image History", 0x9213, -1, + "ImageHistory", 0x9213, -1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); public static final TagInfoRational EXIF_TAG_EXPOSURE_INDEX = new TagInfoRational( - "Exposure Index", 0x9215, -1, + "ExposureIndex", 0x9215, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoByte EXIF_TAG_TIFF_EPSTANDARD_ID_1 = new TagInfoByte( - "TIFF/EP Standard ID", 0x9216, 4, + "TIFF/EPStandardID", 0x9216, 4, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoShort EXIF_TAG_SENSING_METHOD = new TagInfoShort( - "Sensing Method", 0x9217, 1, + "SensingMethod", 0x9217, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final int SENSING_METHOD_VALUE_MONOCHROME_AREA = 1; public static final int SENSING_METHOD_VALUE_ONE_CHIP_COLOR_AREA = 2; @@ -128,7 +128,7 @@ public interface TiffEpTagConstants exte EXIF_TAG_CFAREPEAT_PATTERN_DIM, EXIF_TAG_CFAPATTERN_2, EXIF_TAG_BATTERY_LEVEL, - EXIF_TAG_ICC_PROFILE, + EXIF_TAG_INTER_COLOR_PROFILE, EXIF_TAG_INTERLACE, EXIF_TAG_TIME_ZONE_OFFSET, EXIF_TAG_SELF_TIMER_MODE, 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=1357065&r1=1357064&r2=1357065&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 Jul 4 04:21:03 2012 @@ -39,7 +39,7 @@ import org.apache.commons.imaging.format public interface TiffTagConstants extends TiffFieldTypeConstants { public static final TagInfoLong TIFF_TAG_NEW_SUBFILE_TYPE = new TagInfoLong( - "New Subfile Type", 0xFE, 1, + "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; @@ -51,22 +51,22 @@ public interface TiffTagConstants public static final int SUBFILE_TYPE_VALUE_TRANSPARENCY_MASK_OF_REDUCED_RESOLUTION_MULTI_PAGE_IMAGE = 7; public static final TagInfoShort TIFF_TAG_SUBFILE_TYPE = new TagInfoShort( - "Subfile Type", 0xFF, 1, + "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; public static final TagInfoShortOrLong TIFF_TAG_IMAGE_WIDTH = new TagInfoShortOrLong( - "Image Width", 0x100, 1, + "ImageWidth", 0x100, 1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); public static final TagInfoShortOrLong TIFF_TAG_IMAGE_LENGTH = new TagInfoShortOrLong( - "Image Length", 0x101, 1, + "ImageLength", 0x101, 1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); public static final TagInfoShort TIFF_TAG_BITS_PER_SAMPLE = new TagInfoShort( - "Bits Per Sample", 0x102, -1, + "BitsPerSample", 0x102, -1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); public static final TagInfoShort TIFF_TAG_COMPRESSION = new TagInfoShort( @@ -104,7 +104,7 @@ public interface TiffTagConstants public static final int COMPRESSION_VALUE_PENTAX_PEF_COMPRESSED = 65535; public static final TagInfoShort TIFF_TAG_PHOTOMETRIC_INTERPRETATION = new TagInfoShort( - "Photometric Interpretation", 0x106, 1, + "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; @@ -129,25 +129,25 @@ public interface TiffTagConstants public static final int THRESHOLDING_VALUE_RANDOMIZED_DITHER = 3; public static final TagInfoShort TIFF_TAG_CELL_WIDTH = new TagInfoShort( - "Cell Width", 0x108, 1, + "CellWidth", 0x108, 1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); public static final TagInfoShort TIFF_TAG_CELL_LENGTH = new TagInfoShort( - "Cell Length", 0x109, 1, + "CellLength", 0x109, 1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); public static final TagInfoShort TIFF_TAG_FILL_ORDER = new TagInfoShort( - "Fill Order", 0x10A, 1, + "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; public static final TagInfoAscii TIFF_TAG_DOCUMENT_NAME = new TagInfoAscii( - "Document Name", 0x10D, -1, + "DocumentName", 0x10D, -1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); public static final TagInfoAscii TIFF_TAG_IMAGE_DESCRIPTION = new TagInfoAscii( - "Image Description", 0x10E, -1, + "ImageDescription", 0x10E, -1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); public static final TagInfoAscii TIFF_TAG_MAKE = new TagInfoAscii( @@ -159,7 +159,7 @@ public interface TiffTagConstants TiffDirectoryType.TIFF_DIRECTORY_ROOT); public static final TagInfoShortOrLong TIFF_TAG_STRIP_OFFSETS = new TagInfoShortOrLong( - "Strip Offsets", 0x111, -1, + "StripOffsets", 0x111, -1, TiffDirectoryType.TIFF_DIRECTORY_ROOT, true); public static final TagInfoShort TIFF_TAG_ORIENTATION = new TagInfoShort( @@ -175,23 +175,23 @@ public interface TiffTagConstants public static final int ORIENTATION_VALUE_ROTATE_270_CW = 8; public static final TagInfoShort TIFF_TAG_SAMPLES_PER_PIXEL = new TagInfoShort( - "Samples Per Pixel", 0x115, 1, + "SamplesPerPixel", 0x115, 1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); public static final TagInfoShortOrLong TIFF_TAG_ROWS_PER_STRIP = new TagInfoShortOrLong( - "Rows Per Strip", 0x116, 1, + "RowsPerStrip", 0x116, 1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); public static final TagInfoShortOrLong TIFF_TAG_STRIP_BYTE_COUNTS = new TagInfoShortOrLong( - "Strip Byte Counts", 0x117, -1, + "StripByteCounts", 0x117, -1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); public static final TagInfoShort TIFF_TAG_MIN_SAMPLE_VALUE = new TagInfoShort( - "Min Sample Value", 0x118, -1, + "MinSampleValue", 0x118, -1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); public static final TagInfoShort TIFF_TAG_MAX_SAMPLE_VALUE = new TagInfoShort( - "Max Sample Value", 0x119, -1, + "MaxSampleValue", 0x119, -1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); public static final TagInfoRational TIFF_TAG_XRESOLUTION = new TagInfoRational( @@ -203,13 +203,13 @@ public interface TiffTagConstants TiffDirectoryType.TIFF_DIRECTORY_ROOT); public static final TagInfoShort TIFF_TAG_PLANAR_CONFIGURATION = new TagInfoShort( - "Planar Configuration", 0x11C, 1, + "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; public static final TagInfoAscii TIFF_TAG_PAGE_NAME = new TagInfoAscii( - "Page Name", 0x11D, -1, + "PageName", 0x11D, -1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); public static final TagInfoRational TIFF_TAG_XPOSITION = new TagInfoRational( @@ -221,15 +221,15 @@ public interface TiffTagConstants TiffDirectoryType.TIFF_DIRECTORY_ROOT); public static final TagInfoLong TIFF_TAG_FREE_OFFSETS = new TagInfoLong( - "Free Offsets", 0x120, -1, + "FreeOffsets", 0x120, -1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); public static final TagInfoLong TIFF_TAG_FREE_BYTE_COUNTS = new TagInfoLong( - "Free Byte Counts", 0x121, -1, + "FreeByteCounts", 0x121, -1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); public static final TagInfoShort TIFF_TAG_GRAY_RESPONSE_UNIT = new TagInfoShort( - "Gray Response Unit", 0x122, 1, + "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; @@ -238,30 +238,30 @@ public interface TiffTagConstants public static final int GRAY_RESPONSE_UNIT_VALUE_0_00001 = 5; public static final TagInfoShort TIFF_TAG_GRAY_RESPONSE_CURVE = new TagInfoShort( - "Gray Response Curve", 0x123, -1, + "GrayResponseCurve", 0x123, -1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); public static final TagInfoLong TIFF_TAG_T4_OPTIONS = new TagInfoLong( - "T4 Options", 0x124, 1, + "T4Options", 0x124, 1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); public static final TagInfoLong TIFF_TAG_T6_OPTIONS = new TagInfoLong( - "T6 Options", 0x125, 1, + "T6Options", 0x125, 1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); public static final TagInfoShort TIFF_TAG_RESOLUTION_UNIT = new TagInfoShort( - "Resolution Unit", 0x128, 1, + "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; public static final TagInfoShort TIFF_TAG_PAGE_NUMBER = new TagInfoShort( - "Page Number", 0x129, 2, + "PageNumber", 0x129, 2, TiffDirectoryType.TIFF_DIRECTORY_ROOT); public static final TagInfoShort TIFF_TAG_TRANSFER_FUNCTION = new TagInfoShort( - "Transfer Function", 0x12D, -1, + "TransferFunction", 0x12D, -1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); public static final TagInfoAscii TIFF_TAG_SOFTWARE = new TagInfoAscii( @@ -269,7 +269,7 @@ public interface TiffTagConstants TiffDirectoryType.TIFF_DIRECTORY_ROOT); public static final TagInfoAscii TIFF_TAG_DATE_TIME = new TagInfoAscii( - "Date Time", 0x132, 20, + "DateTime", 0x132, 20, TiffDirectoryType.TIFF_DIRECTORY_ROOT); public static final TagInfoAscii TIFF_TAG_ARTIST = new TagInfoAscii( @@ -277,7 +277,7 @@ public interface TiffTagConstants TiffDirectoryType.TIFF_DIRECTORY_ROOT); public static final TagInfoAscii TIFF_TAG_HOST_COMPUTER = new TagInfoAscii( - "Host Computer", 0x13C, -1, + "HostComputer", 0x13C, -1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); public static final TagInfoShort TIFF_TAG_PREDICTOR = new TagInfoShort( @@ -287,65 +287,65 @@ public interface TiffTagConstants public static final int PREDICTOR_VALUE_HORIZONTAL_DIFFERENCING = 2; public static final TagInfoRational TIFF_TAG_WHITE_POINT = new TagInfoRational( - "White Point", 0x13E, 2, + "WhitePoint", 0x13E, 2, TiffDirectoryType.TIFF_DIRECTORY_ROOT); public static final TagInfoRational TIFF_TAG_PRIMARY_CHROMATICITIES = new TagInfoRational( - "Primary Chromaticities", 0x13F, 6, + "PrimaryChromaticities", 0x13F, 6, TiffDirectoryType.TIFF_DIRECTORY_ROOT); public static final TagInfoShort TIFF_TAG_COLOR_MAP = new TagInfoShort( - "Color Map", 0x140, -1, + "ColorMap", 0x140, -1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); public static final TagInfoShort TIFF_TAG_HALFTONE_HINTS = new TagInfoShort( - "Halftone Hints", 0x141, 2, + "HalftoneHints", 0x141, 2, TiffDirectoryType.TIFF_DIRECTORY_ROOT); public static final TagInfoShortOrLong TIFF_TAG_TILE_WIDTH = new TagInfoShortOrLong( - "Tile Width", 0x142, 1, + "TileWidth", 0x142, 1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); public static final TagInfoShortOrLong TIFF_TAG_TILE_LENGTH = new TagInfoShortOrLong( - "Tile Length", 0x143, 1, + "TileLength", 0x143, 1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); public static final TagInfoLong TIFF_TAG_TILE_OFFSETS = new TagInfoLong( - "Tile Offsets", 0x144, -1, + "TileOffsets", 0x144, -1, TiffDirectoryType.TIFF_DIRECTORY_ROOT, true); public static final TagInfoShortOrLong TIFF_TAG_TILE_BYTE_COUNTS = new TagInfoShortOrLong( - "Tile Byte Counts", 0x145, -1, + "TileByteCounts", 0x145, -1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); public static final TagInfoShort TIFF_TAG_INK_SET = new TagInfoShort( - "Ink Set", 0x14C, 1, + "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; public static final TagInfoAscii TIFF_TAG_INK_NAMES = new TagInfoAscii( - "Ink Names", 0x14D, -1, + "InkNames", 0x14D, -1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); public static final TagInfoShort TIFF_TAG_NUMBER_OF_INKS = new TagInfoShort( - "Number Of Inks", 0x14E, 1, + "NumberOfInks", 0x14E, 1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); public static final TagInfoByteOrShort TIFF_TAG_DOT_RANGE = new TagInfoByteOrShort( - "Dot Range", 0x150, -1, + "DotRange", 0x150, -1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); public static final TagInfoAscii TIFF_TAG_TARGET_PRINTER = new TagInfoAscii( - "Target Printer", 0x151, -1, + "TargetPrinter", 0x151, -1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); public static final TagInfoShort TIFF_TAG_EXTRA_SAMPLES = new TagInfoShort( - "Extra Samples", 0x152, -1, + "ExtraSamples", 0x152, -1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); public static final TagInfoShort TIFF_TAG_SAMPLE_FORMAT = new TagInfoShort( - "Sample Format", 0x153, -1, + "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; @@ -355,15 +355,15 @@ public interface TiffTagConstants public static final int SAMPLE_FORMAT_VALUE_IEEE_FLOATING_POINT_1 = 6; public static final TagInfoAny TIFF_TAG_SMIN_SAMPLE_VALUE = new TagInfoAny( - "SMin Sample Value", 0x154, -1, + "SMinSampleValue", 0x154, -1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); public static final TagInfoAny TIFF_TAG_SMAX_SAMPLE_VALUE = new TagInfoAny( - "SMax Sample Value", 0x155, -1, + "SMaxSampleValue", 0x155, -1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); public static final TagInfoShort TIFF_TAG_TRANSFER_RANGE = new TagInfoShort( - "Transfer Range", 0x156, 6, + "TransferRange", 0x156, 6, TiffDirectoryType.TIFF_DIRECTORY_ROOT); public static final TagInfoShort TIFF_TAG_JPEG_PROC = new TagInfoShort( @@ -373,23 +373,23 @@ public interface TiffTagConstants public static final int JPEGPROC_VALUE_LOSSLESS = 14; public static final TagInfoLong TIFF_TAG_JPEG_INTERCHANGE_FORMAT = new TagInfoLong( - "JPEGInterchange Format", 0x201, 1, + "JPEGInterchangeFormat", 0x201, 1, TiffDirectoryType.TIFF_DIRECTORY_ROOT, true); public static final TagInfoLong TIFF_TAG_JPEG_INTERCHANGE_FORMAT_LENGTH = new TagInfoLong( - "JPEGInterchange Format Length", 0x202, + "JPEGInterchangeFormatLength", 0x202, 1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); public static final TagInfoShort TIFF_TAG_JPEG_RESTART_INTERVAL = new TagInfoShort( - "JPEGRestart Interval", 0x203, 1, + "JPEGRestartInterval", 0x203, 1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); public static final TagInfoShort TIFF_TAG_JPEG_LOSSLESS_PREDICTORS = new TagInfoShort( - "JPEGLossless Predictors", 0x205, -1, + "JPEGLosslessPredictors", 0x205, -1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); public static final TagInfoShort TIFF_TAG_JPEG_POINT_TRANSFORMS = new TagInfoShort( - "JPEGPoint Transforms", 0x206, -1, + "JPEGPointTransforms", 0x206, -1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); public static final TagInfoLong TIFF_TAG_JPEG_QTABLES = new TagInfoLong( @@ -405,21 +405,21 @@ public interface TiffTagConstants TiffDirectoryType.TIFF_DIRECTORY_ROOT); public static final TagInfoRational TIFF_TAG_YCBCR_COEFFICIENTS = new TagInfoRational( - "YCbCr Coefficients", 0x211, 3, + "YCbCrCoefficients", 0x211, 3, TiffDirectoryType.TIFF_DIRECTORY_ROOT); public static final TagInfoShort TIFF_TAG_YCBCR_SUB_SAMPLING = new TagInfoShort( - "YCbCr Sub Sampling", 0x212, 2, + "YCbCrSubSampling", 0x212, 2, TiffDirectoryType.TIFF_DIRECTORY_ROOT); public static final TagInfoShort TIFF_TAG_YCBCR_POSITIONING = new TagInfoShort( - "YCbCr Positioning", 0x213, 1, + "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; public static final TagInfoLong TIFF_TAG_REFERENCE_BLACK_WHITE = new TagInfoLong( - "Reference Black White", 0x214, -1, + "ReferenceBlackWhite", 0x214, -1, TiffDirectoryType.TIFF_DIRECTORY_ROOT); public static final TagInfoAscii TIFF_TAG_COPYRIGHT = new TagInfoAscii( 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=1357065&r1=1357064&r2=1357065&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 Jul 4 04:21:03 2012 @@ -29,7 +29,7 @@ import org.apache.commons.imaging.format */ public interface WangTagConstants { public static final TagInfoByte EXIF_TAG_WANG_ANNOTATION = new TagInfoByte( - "Wang Annotation", 0x80a4, -1, + "WangAnnotation", 0x80a4, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final List ALL_WANG_TAGS =