Author: damjan
Date: Mon Mar 19 20:15:20 2012
New Revision: 1302635
URL: http://svn.apache.org/viewvc?rev=1302635&view=rev
Log:
Factor out Microsoft and HylaFax tags.
Added:
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/HylaFaxTagConstants.java
(with props)
Modified:
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/AllTagConstants.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/ExifTagConstants.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/MicrosoftTagConstants.java
Modified:
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/AllTagConstants.java
URL:
http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/AllTagConstants.java?rev=1302635&r1=1302634&r2=1302635&view=diff
==============================================================================
---
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/AllTagConstants.java
(original)
+++
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/AllTagConstants.java
Mon Mar 19 20:15:20 2012
@@ -32,9 +32,10 @@ public interface AllTagConstants
DcfTagConstants.ALL_DCF_TAGS,
ExifTagConstants.ALL_EXIF_TAGS,
GpsTagConstants.ALL_GPS_TAGS,
+ HylaFaxTagConstants.ALL_HYLAFAX_TAGS,
MicrosoftTagConstants.ALL_MICROSOFT_TAGS,
Rfc2301TagConstants.ALL_RFC_2301_TAGS,
Tiff4TagConstants.ALL_TIFF_4_TAGS,
TiffTagConstants.ALL_TIFF_TAGS,
WangTagConstants.ALL_WANG_TAGS));
-}
\ No newline at end of file
+}
Modified:
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/ExifTagConstants.java
URL:
http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/ExifTagConstants.java?rev=1302635&r1=1302634&r2=1302635&view=diff
==============================================================================
---
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/ExifTagConstants.java
(original)
+++
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/ExifTagConstants.java
Mon Mar 19 20:15:20 2012
@@ -277,15 +277,6 @@ public interface ExifTagConstants
public static final TagInfoShort EXIF_TAG_SELF_TIMER_MODE = new
TagInfoShort(
"Self Timer Mode", 0x882b, 1,
TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD);
- public static final TagInfoLong EXIF_TAG_FAX_RECV_PARAMS = new TagInfoLong(
- "Fax Recv Params", 0x885c, 1,
- TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
- public static final TagInfoAscii EXIF_TAG_FAX_SUB_ADDRESS = new
TagInfoAscii(
- "Fax Sub Address", 0x885d, -1,
- TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
- public static final TagInfoLong EXIF_TAG_FAX_RECV_TIME = new TagInfoLong(
- "Fax Recv Time", 0x885e, 1,
- TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
public static final TagInfoLong EXIF_TAG_LEAF_SUB_IFD = new TagInfoLong(
"Leaf Sub IFD", 0x888a, 1,
TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
@@ -456,16 +447,6 @@ public interface ExifTagConstants
public static final TagInfoUndefined EXIF_TAG_IMAGE_SOURCE_DATA = new
TagInfoUndefined(
"Image Source Data", 0x935c, 1,
TiffDirectoryType.EXIF_DIRECTORY_IFD0);
- public static final TagInfoXpString EXIF_TAG_XPTITLE = new
TagInfoXpString("XPTitle",
- 0x9c9b, -1, TiffDirectoryType.EXIF_DIRECTORY_IFD0);
- public static final TagInfoXpString EXIF_TAG_XPCOMMENT = new
TagInfoXpString("XPComment",
- 0x9c9c, -1, TiffDirectoryType.EXIF_DIRECTORY_IFD0);
- public static final TagInfoXpString EXIF_TAG_XPAUTHOR = new
TagInfoXpString("XPAuthor",
- 0x9c9d, -1, TiffDirectoryType.EXIF_DIRECTORY_IFD0);
- public static final TagInfoXpString EXIF_TAG_XPKEYWORDS = new
TagInfoXpString("XPKeywords",
- 0x9c9e, -1, TiffDirectoryType.EXIF_DIRECTORY_IFD0);
- public static final TagInfoXpString EXIF_TAG_XPSUBJECT = new
TagInfoXpString("XPSubject",
- 0x9c9f, -1, TiffDirectoryType.EXIF_DIRECTORY_IFD0);
public static final TagInfoUndefined EXIF_TAG_FLASHPIX_VERSION = new
TagInfoUndefined(
"Flashpix Version", 0xa000, 1,
TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD);
@@ -1023,8 +1004,7 @@ public interface ExifTagConstants
EXIF_TAG_SPECTRAL_SENSITIVITY, EXIF_TAG_GPSINFO,
EXIF_TAG_ISO,
EXIF_TAG_OPTO__ELECTRIC_CONV_FACTOR, EXIF_TAG_INTERLACE,
EXIF_TAG_TIME_ZONE_OFFSET, EXIF_TAG_SELF_TIMER_MODE,
- EXIF_TAG_FAX_RECV_PARAMS, EXIF_TAG_FAX_SUB_ADDRESS,
- EXIF_TAG_FAX_RECV_TIME, EXIF_TAG_LEAF_SUB_IFD,
+ EXIF_TAG_LEAF_SUB_IFD,
EXIF_TAG_EXIF_VERSION, EXIF_TAG_DATE_TIME_ORIGINAL,
EXIF_TAG_CREATE_DATE, EXIF_TAG_COMPONENTS_CONFIGURATION,
EXIF_TAG_COMPRESSED_BITS_PER_PIXEL,
EXIF_TAG_SHUTTER_SPEED_VALUE,
@@ -1042,8 +1022,7 @@ public interface ExifTagConstants
EXIF_TAG_EXPOSURE_INDEX, EXIF_TAG_TIFF_EPSTANDARD_ID_1,
EXIF_TAG_SENSING_METHOD, EXIF_TAG_STO_NITS,
EXIF_TAG_SUB_SEC_TIME,
EXIF_TAG_SUB_SEC_TIME_ORIGINAL,
EXIF_TAG_SUB_SEC_TIME_DIGITIZED,
- EXIF_TAG_IMAGE_SOURCE_DATA, EXIF_TAG_XPTITLE,
EXIF_TAG_XPCOMMENT,
- EXIF_TAG_XPAUTHOR, EXIF_TAG_XPKEYWORDS, EXIF_TAG_XPSUBJECT,
+ EXIF_TAG_IMAGE_SOURCE_DATA,
EXIF_TAG_FLASHPIX_VERSION,
EXIF_TAG_EXIF_IMAGE_WIDTH, EXIF_TAG_EXIF_IMAGE_LENGTH,
EXIF_TAG_RELATED_SOUND_FILE, EXIF_TAG_INTEROP_OFFSET,
Added:
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/HylaFaxTagConstants.java
URL:
http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/HylaFaxTagConstants.java?rev=1302635&view=auto
==============================================================================
---
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/HylaFaxTagConstants.java
(added)
+++
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/HylaFaxTagConstants.java
Mon Mar 19 20:15:20 2012
@@ -0,0 +1,34 @@
+package org.apache.commons.sanselan.formats.tiff.constants;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.apache.commons.sanselan.formats.tiff.taginfos.TagInfo;
+import org.apache.commons.sanselan.formats.tiff.taginfos.TagInfoAscii;
+import org.apache.commons.sanselan.formats.tiff.taginfos.TagInfoLong;
+
+public interface HylaFaxTagConstants extends TiffFieldTypeConstants {
+ public static final TagInfoLong EXIF_TAG_FAX_RECV_PARAMS = new TagInfoLong(
+ "Fax Recv Params", 0x885c, 1,
+ TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
+
+ public static final TagInfoAscii EXIF_TAG_FAX_SUB_ADDRESS = new
TagInfoAscii(
+ "Fax Sub Address", 0x885d, -1,
+ TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
+
+ public static final TagInfoLong EXIF_TAG_FAX_RECV_TIME = new TagInfoLong(
+ "Fax Recv Time", 0x885e, 1,
+ TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
+
+ public static final TagInfoAscii EXIF_TAG_FAX_DCS = new TagInfoAscii(
+ "Fax DCS", 0x885f, -1,
+ TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
+
+ public static final List<TagInfo> ALL_HYLAFAX_TAGS =
+ Collections.unmodifiableList(Arrays.asList(
+ EXIF_TAG_FAX_RECV_PARAMS,
+ EXIF_TAG_FAX_SUB_ADDRESS,
+ EXIF_TAG_FAX_RECV_TIME,
+ EXIF_TAG_FAX_DCS));
+}
Propchange:
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/HylaFaxTagConstants.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/MicrosoftTagConstants.java
URL:
http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/MicrosoftTagConstants.java?rev=1302635&r1=1302634&r2=1302635&view=diff
==============================================================================
---
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/MicrosoftTagConstants.java
(original)
+++
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/MicrosoftTagConstants.java
Mon Mar 19 20:15:20 2012
@@ -6,19 +6,47 @@ import java.util.List;
import org.apache.commons.sanselan.formats.tiff.taginfos.TagInfo;
import org.apache.commons.sanselan.formats.tiff.taginfos.TagInfoShort;
+import org.apache.commons.sanselan.formats.tiff.taginfos.TagInfoXpString;
/**
* Largely undocumented and derived by experimentation.
*/
public interface MicrosoftTagConstants {
- public static final TagInfoShort EXIF_TAG_RATING = new
TagInfoShort("Rating", 0x4746,
- 1, TiffDirectoryType.EXIF_DIRECTORY_IFD0);
+ public static final TagInfoShort EXIF_TAG_RATING = new TagInfoShort(
+ "Rating", 0x4746, 1,
+ TiffDirectoryType.EXIF_DIRECTORY_IFD0);
public static final TagInfoShort EXIF_TAG_RATING_PERCENT = new
TagInfoShort(
- "Rating Percent", 0x4749, 1,
TiffDirectoryType.EXIF_DIRECTORY_IFD0);
+ "Rating Percent", 0x4749, 1,
+ TiffDirectoryType.EXIF_DIRECTORY_IFD0);
+
+ public static final TagInfoXpString EXIF_TAG_XPTITLE = new TagInfoXpString(
+ "XPTitle", 0x9c9b, -1,
+ TiffDirectoryType.EXIF_DIRECTORY_IFD0);
+
+ public static final TagInfoXpString EXIF_TAG_XPCOMMENT = new
TagInfoXpString(
+ "XPComment", 0x9c9c, -1,
+ TiffDirectoryType.EXIF_DIRECTORY_IFD0);
+
+ public static final TagInfoXpString EXIF_TAG_XPAUTHOR = new
TagInfoXpString(
+ "XPAuthor", 0x9c9d, -1,
+ TiffDirectoryType.EXIF_DIRECTORY_IFD0);
+
+ public static final TagInfoXpString EXIF_TAG_XPKEYWORDS = new
TagInfoXpString(
+ "XPKeywords", 0x9c9e, -1,
+ TiffDirectoryType.EXIF_DIRECTORY_IFD0);
+
+ public static final TagInfoXpString EXIF_TAG_XPSUBJECT = new
TagInfoXpString(
+ "XPSubject", 0x9c9f, -1,
+ TiffDirectoryType.EXIF_DIRECTORY_IFD0);
public static final List<TagInfo> ALL_MICROSOFT_TAGS =
- Collections.unmodifiableList(Arrays.asList(new TagInfo[] {
+ Collections.unmodifiableList(Arrays.asList(
EXIF_TAG_RATING,
- EXIF_TAG_RATING_PERCENT }));
+ EXIF_TAG_RATING_PERCENT,
+ EXIF_TAG_XPTITLE,
+ EXIF_TAG_XPCOMMENT,
+ EXIF_TAG_XPAUTHOR,
+ EXIF_TAG_XPKEYWORDS,
+ EXIF_TAG_XPSUBJECT));
}
