You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by da...@apache.org on 2012/03/25 09:52:44 UTC
svn commit: r1304991 - in /commons/proper/sanselan/trunk/src:
main/java/org/apache/commons/sanselan/formats/tiff/constants/
test/java/org/apache/commons/sanselan/formats/tiff/
Author: damjan
Date: Sun Mar 25 07:52:44 2012
New Revision: 1304991
URL: http://svn.apache.org/viewvc?rev=1304991&view=rev
Log:
Factor out GDAL library tags.
Added:
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/GdalLibraryTagConstants.java (with props)
Modified:
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/AllTagConstants.java
commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/ExifTagConstants.java
commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/tiff/TiffTagIntegrityTest.java
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=1304991&r1=1304990&r2=1304991&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/AllTagConstants.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/AllTagConstants.java Sun Mar 25 07:52:44 2012
@@ -28,6 +28,7 @@ public interface AllTagConstants extends
DcfTagConstants,
DngTagConstants,
ExifTagConstants,
+ GdalLibraryTagConstants,
GpsTagConstants,
HylaFaxTagConstants,
MicrosoftTagConstants,
@@ -48,6 +49,7 @@ public interface AllTagConstants extends
DcfTagConstants.ALL_DCF_TAGS,
DngTagConstants.ALL_DNG_TAGS,
ExifTagConstants.ALL_EXIF_TAGS,
+ GdalLibraryTagConstants.ALL_GDAL_LIBRARY_TAGS,
GpsTagConstants.ALL_GPS_TAGS,
HylaFaxTagConstants.ALL_HYLAFAX_TAGS,
MicrosoftTagConstants.ALL_MICROSOFT_TAGS,
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=1304991&r1=1304990&r2=1304991&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/ExifTagConstants.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/ExifTagConstants.java Sun Mar 25 07:52:44 2012
@@ -493,12 +493,6 @@ public interface ExifTagConstants
public static final TagInfoAscii EXIF_TAG_IMAGE_UNIQUE_ID = new TagInfoAscii(
"Image Unique ID", 0xa420, 1,
TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD);
- public static final TagInfoAscii EXIF_TAG_GDALMETADATA = new TagInfoAscii(
- "GDALMetadata", 0xa480, -1,
- TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
- public static final TagInfoAscii EXIF_TAG_GDALNO_DATA = new TagInfoAscii(
- "GDALNo Data", 0xa481, -1,
- TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
public static final TagInfoRational EXIF_TAG_GAMMA = new TagInfoRational("Gamma", 0xa500,
1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD);
public static final TagInfoUnknown EXIF_TAG_ANNOTATIONS = new TagInfoUnknown(
@@ -615,7 +609,7 @@ public interface ExifTagConstants
EXIF_TAG_CONTRAST_1, EXIF_TAG_SATURATION_1, EXIF_TAG_SHARPNESS_1,
EXIF_TAG_DEVICE_SETTING_DESCRIPTION,
EXIF_TAG_SUBJECT_DISTANCE_RANGE, EXIF_TAG_IMAGE_UNIQUE_ID,
- EXIF_TAG_GDALMETADATA, EXIF_TAG_GDALNO_DATA, EXIF_TAG_GAMMA,
+ EXIF_TAG_GAMMA,
EXIF_TAG_ANNOTATIONS, EXIF_TAG_PRINT_IM,
EXIF_TAG_DNG_ADOBE_DATA, EXIF_TAG_DNG_PENTAX_DATA,
EXIF_TAG_OFFSET_SCHEMA, EXIF_TAG_OWNER_NAME,
Added: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/GdalLibraryTagConstants.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/GdalLibraryTagConstants.java?rev=1304991&view=auto
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/GdalLibraryTagConstants.java (added)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/GdalLibraryTagConstants.java Sun Mar 25 07:52:44 2012
@@ -0,0 +1,30 @@
+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;
+
+/**
+ * GDAL library.
+ * <BR>
+ * http://www.awaresystems.be/imaging/tiff/tifftags/gdal_metadata.html
+ * <BR>
+ * http://www.awaresystems.be/imaging/tiff/tifftags/gdal_nodata.html
+ */
+public interface GdalLibraryTagConstants {
+ public static final TagInfoAscii EXIF_TAG_GDALMETADATA = new TagInfoAscii(
+ "GDALMetadata", 0xa480, -1,
+ TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
+
+ public static final TagInfoAscii EXIF_TAG_GDALNO_DATA = new TagInfoAscii(
+ "GDALNo Data", 0xa481, -1,
+ TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN);
+
+ public static final List<TagInfo> ALL_GDAL_LIBRARY_TAGS =
+ Collections.unmodifiableList(Arrays.asList(new TagInfo[] {
+ EXIF_TAG_GDALMETADATA,
+ EXIF_TAG_GDALNO_DATA}));
+}
Propchange: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/constants/GdalLibraryTagConstants.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/tiff/TiffTagIntegrityTest.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/tiff/TiffTagIntegrityTest.java?rev=1304991&r1=1304990&r2=1304991&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/tiff/TiffTagIntegrityTest.java (original)
+++ commons/proper/sanselan/trunk/src/test/java/org/apache/commons/sanselan/formats/tiff/TiffTagIntegrityTest.java Sun Mar 25 07:52:44 2012
@@ -26,6 +26,7 @@ import org.apache.commons.sanselan.forma
import org.apache.commons.sanselan.formats.tiff.constants.DcfTagConstants;
import org.apache.commons.sanselan.formats.tiff.constants.DngTagConstants;
import org.apache.commons.sanselan.formats.tiff.constants.ExifTagConstants;
+import org.apache.commons.sanselan.formats.tiff.constants.GdalLibraryTagConstants;
import org.apache.commons.sanselan.formats.tiff.constants.GpsTagConstants;
import org.apache.commons.sanselan.formats.tiff.constants.MicrosoftHdPhotoTagConstants;
import org.apache.commons.sanselan.formats.tiff.constants.MicrosoftTagConstants;
@@ -46,6 +47,7 @@ public class TiffTagIntegrityTest extend
verifyFields(DcfTagConstants.class, DcfTagConstants.ALL_DCF_TAGS);
verifyFields(DngTagConstants.class, DngTagConstants.ALL_DNG_TAGS);
verifyFields(ExifTagConstants.class, ExifTagConstants.ALL_EXIF_TAGS);
+ verifyFields(GdalLibraryTagConstants.class, GdalLibraryTagConstants.ALL_GDAL_LIBRARY_TAGS);
verifyFields(GpsTagConstants.class, GpsTagConstants.ALL_GPS_TAGS);
verifyFields(MolecularDynamicsGelTagConstants.class, MolecularDynamicsGelTagConstants.ALL_MOLECULAR_DYNAMICS_GEL_TAGS);
verifyFields(MicrosoftTagConstants.class, MicrosoftTagConstants.ALL_MICROSOFT_TAGS);