Changeset 8132 in josm for trunk/src/com/drew/metadata/exif/ExifSubIFDDirectory.java

Timestamp:

2015-03-10T01:17:39+01:00 (9 years ago)

Author:

Don-vip

Message:

fix #11162 - update to metadata-extractor 2.7.2

File:

• trunk/src/com/drew/metadata/exif/ExifSubIFDDirectory.java (modified) (12 diffs)

trunk/src/com/drew/metadata/exif/ExifSubIFDDirectory.java

@@ -1 +1 @@
 /*
- * Copyright 2002-2012 Drew Noakes
+ * Copyright 2002-2015 Drew Noakes
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
@@ -16 +16 @@
  * More information about this project is available at:
  *
- *    http://drewnoakes.com/code/exif/
- *    http://code.google.com/p/metadata-extractor/
+ *    https://drewnoakes.com/code/exif/
+ *    https://github.com/drewnoakes/metadata-extractor
  */
 package com.drew.metadata.exif;
@@ -29 +29 @@
  * Describes Exif tags from the SubIFD directory.
  *
- * @author Drew Noakes http://drewnoakes.com
+ * @author Drew Noakes https://drewnoakes.com
  */
 public class ExifSubIFDDirectory extends Directory
@@ -133 +133 @@
     /**
      * Indicates the Opto-Electric Conversion Function (OECF) specified in ISO 14524.
-     * <p/>
+     * <p>
      * OECF is the relationship between the camera optical input and the image values.
-     * <p/>
+     * <p>
      * The values are:
      * <ul>
@@ -260 +260 @@
      */
     public static final int TAG_FOCAL_LENGTH = 0x920A;
+
+    /**
+     * This tag holds the Exif Makernote. Makernotes are free to be in any format, though they are often IFDs.
+     * To determine the format, we consider the starting bytes of the makernote itself and sometimes the
+     * camera model and make.
+     * <p>
+     * The component count for this tag includes all of the bytes needed for the makernote.
+     */
+    public static final int TAG_MAKERNOTE = 0x927C;
+
     public static final int TAG_USER_COMMENT = 0x9286;
+
     public static final int TAG_SUBSECOND_TIME = 0x9290;
     public static final int TAG_SUBSECOND_TIME_ORIGINAL = 0x9291;
     public static final int TAG_SUBSECOND_TIME_DIGITIZED = 0x9292;
+
     public static final int TAG_FLASHPIX_VERSION = 0xA000;
     /**
@@ -274 +286 @@
     public static final int TAG_EXIF_IMAGE_HEIGHT = 0xA003;
     public static final int TAG_RELATED_SOUND_FILE = 0xA004;
-    public static final int TAG_FOCAL_PLANE_X_RES = 0xA20E;
-    public static final int TAG_FOCAL_PLANE_Y_RES = 0xA20F;
+
+    /** This tag is a pointer to the Exif Interop IFD. */
+    public static final int TAG_INTEROP_OFFSET = 0xA005;
+
+    public static final int TAG_FOCAL_PLANE_X_RESOLUTION = 0xA20E;
+    public static final int TAG_FOCAL_PLANE_Y_RESOLUTION = 0xA20F;
     /**
      * Unit of FocalPlaneXResolution/FocalPlaneYResolution. '1' means no-unit,
@@ -285 +301 @@
      * been changed to use value '2' but it doesn't match to actual value also.
      */
-    public static final int TAG_FOCAL_PLANE_UNIT = 0xA210;
+    public static final int TAG_FOCAL_PLANE_RESOLUTION_UNIT = 0xA210;
     public static final int TAG_EXPOSURE_INDEX = 0xA215;
     public static final int TAG_SENSING_METHOD = 0xA217;
@@ -512 +528 @@
         _tagNameMap.put(0x0200, "JPEG Proc");
         _tagNameMap.put(TAG_COMPRESSED_AVERAGE_BITS_PER_PIXEL, "Compressed Bits Per Pixel");
-        _tagNameMap.put(0x927C, "Maker Note");
-        _tagNameMap.put(0xA005, "Interoperability Offset");
+        _tagNameMap.put(TAG_MAKERNOTE, "Makernote");
+        _tagNameMap.put(TAG_INTEROP_OFFSET, "Interoperability Offset");
 
         _tagNameMap.put(TAG_NEW_SUBFILE_TYPE, "New Subfile Type");
@@ -586 +602 @@
         _tagNameMap.put(TAG_SPATIAL_FREQ_RESPONSE_2, "Spatial Frequency Response");
         // 0x920E in TIFF/EP
-        _tagNameMap.put(TAG_FOCAL_PLANE_X_RES, "Focal Plane X Resolution");
+        _tagNameMap.put(TAG_FOCAL_PLANE_X_RESOLUTION, "Focal Plane X Resolution");
         // 0x920F in TIFF/EP
-        _tagNameMap.put(TAG_FOCAL_PLANE_Y_RES, "Focal Plane Y Resolution");
+        _tagNameMap.put(TAG_FOCAL_PLANE_Y_RESOLUTION, "Focal Plane Y Resolution");
         // 0x9210 in TIFF/EP
-        _tagNameMap.put(TAG_FOCAL_PLANE_UNIT, "Focal Plane Resolution Unit");
+        _tagNameMap.put(TAG_FOCAL_PLANE_RESOLUTION_UNIT, "Focal Plane Resolution Unit");
         // 0x9214 in TIFF/EP
         _tagNameMap.put(TAG_SUBJECT_LOCATION_2, "Subject Location");
@@ -614 +630 @@
         _tagNameMap.put(TAG_SUBJECT_DISTANCE_RANGE, "Subject Distance Range");
         _tagNameMap.put(TAG_IMAGE_UNIQUE_ID, "Unique Image ID");
-        
+
         _tagNameMap.put(TAG_CAMERA_OWNER_NAME, "Camera Owner Name");
         _tagNameMap.put(TAG_BODY_SERIAL_NUMBER, "Body Serial Number");
@@ -634 +650 @@
     }
 
+    @Override
     @NotNull
     public String getName()
@@ -640 +657 @@
     }
 
+    @Override
     @NotNull
     protected HashMap<Integer, String> getTagNameMap()