Changeset 6127 in josm for trunk/src/com/drew/metadata/exif/FujifilmMakernoteDirectory.java

Timestamp:

2013-08-09T18:05:11+02:00 (12 years ago)

Author:

bastiK

Message:

applied #8895 - Upgrade metadata-extractor to v. 2.6.4 (patch by ebourg)

File:

• trunk/src/com/drew/metadata/exif/FujifilmMakernoteDirectory.java (modified) (4 diffs)

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

@@ -1 +1 @@
 /*
- * This is public domain software - that is, you can do whatever you want
- * with it, and include it software that is licensed under the GNU or the
- * BSD license, or whatever other licence you choose, including proprietary
- * closed source licenses.  I do ask that you leave this header in tact.
+ * Copyright 2002-2012 Drew Noakes
  *
- * If you make modifications to this code that you think would benefit the
- * wider community, please send me a copy and I'll post it on my site.
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
  *
- * If you make use of this code, I'd appreciate hearing about it.
- *   drew@drewnoakes.com
- * Latest version of this software kept at
- *   http://drewnoakes.com/
+ *        http://www.apache.org/licenses/LICENSE-2.0
  *
- * Created by dnoakes on 27-Nov-2002 10:10:47 using IntelliJ IDEA.
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ *
+ * More information about this project is available at:
+ *
+ *    http://drewnoakes.com/code/exif/
+ *    http://code.google.com/p/metadata-extractor/
  */
 package com.drew.metadata.exif;
 
+import com.drew.lang.annotations.NotNull;
 import com.drew.metadata.Directory;
 
@@ -22 +27 @@
 
 /**
+ * Describes tags specific to Fujifilm cameras.
  *
+ * @author Drew Noakes http://drewnoakes.com
  */
 public class FujifilmMakernoteDirectory extends Directory
 {
     public static final int TAG_FUJIFILM_MAKERNOTE_VERSION = 0x0000;
-    public static final int TAG_FUJIFILM_QUALITY = 0x1000;
-    public static final int TAG_FUJIFILM_SHARPNESS = 0x1001;
-    public static final int TAG_FUJIFILM_WHITE_BALANCE = 0x1002;
-    public static final int TAG_FUJIFILM_COLOR = 0x1003;
-    public static final int TAG_FUJIFILM_TONE = 0x1004;
-    public static final int TAG_FUJIFILM_FLASH_MODE = 0x1010;
-    public static final int TAG_FUJIFILM_FLASH_STRENGTH = 0x1011;
-    public static final int TAG_FUJIFILM_MACRO = 0x1020;
-    public static final int TAG_FUJIFILM_FOCUS_MODE = 0x1021;
-    public static final int TAG_FUJIFILM_SLOW_SYNCHRO = 0x1030;
-    public static final int TAG_FUJIFILM_PICTURE_MODE = 0x1031;
-    public static final int TAG_FUJIFILM_UNKNOWN_1 = 0x1032;
-    public static final int TAG_FUJIFILM_CONTINUOUS_TAKING_OR_AUTO_BRACKETTING = 0x1100;
-    public static final int TAG_FUJIFILM_UNKNOWN_2 = 0x1200;
-    public static final int TAG_FUJIFILM_BLUR_WARNING = 0x1300;
-    public static final int TAG_FUJIFILM_FOCUS_WARNING = 0x1301;
-    public static final int TAG_FUJIFILM_AE_WARNING = 0x1302;
+    public static final int TAG_FUJIFILM_QUALITY = 0x1000; // 4096
+    public static final int TAG_FUJIFILM_SHARPNESS = 0x1001; // 4097
+    public static final int TAG_FUJIFILM_WHITE_BALANCE = 0x1002; // 4098
+    public static final int TAG_FUJIFILM_COLOR_SATURATION = 0x1003; // 4099
+    public static final int TAG_FUJIFILM_TONE = 0x1004; // 4100
+    public static final int TAG_FUJIFILM_FLASH_MODE = 0x1010; // 4112
+    public static final int TAG_FUJIFILM_FLASH_STRENGTH = 0x1011; // 4113
+    public static final int TAG_FUJIFILM_MACRO = 0x1020; // 4128
+    public static final int TAG_FUJIFILM_FOCUS_MODE = 0x1021; // 4129
+    public static final int TAG_FUJIFILM_SLOW_SYNCH = 0x1030; // 4144
+    public static final int TAG_FUJIFILM_PICTURE_MODE = 0x1031; // 4145
+    public static final int TAG_FUJIFILM_UNKNOWN_1 = 0x1032; // 4146
+    public static final int TAG_FUJIFILM_CONTINUOUS_TAKING_OR_AUTO_BRACKETTING = 0x1100; // 4352
+    public static final int TAG_FUJIFILM_UNKNOWN_2 = 0x1200; // 4608
+    public static final int TAG_FUJIFILM_BLUR_WARNING = 0x1300; // 4864
+    public static final int TAG_FUJIFILM_FOCUS_WARNING = 0x1301; // 4865
+    public static final int TAG_FUJIFILM_AE_WARNING = 0x1302; // 4866
 
-    protected static final HashMap tagNameMap = new HashMap();
+    @NotNull
+    protected static final HashMap<Integer, String> _tagNameMap = new HashMap<Integer, String>();
 
     static
     {
-        tagNameMap.put(new Integer(TAG_FUJIFILM_AE_WARNING), "AE Warning");
-        tagNameMap.put(new Integer(TAG_FUJIFILM_BLUR_WARNING), "Blur Warning");
-        tagNameMap.put(new Integer(TAG_FUJIFILM_COLOR), "Color");
-        tagNameMap.put(new Integer(TAG_FUJIFILM_CONTINUOUS_TAKING_OR_AUTO_BRACKETTING), "Continuous Taking Or Auto Bracketting");
-        tagNameMap.put(new Integer(TAG_FUJIFILM_FLASH_MODE), "Flash Mode");
-        tagNameMap.put(new Integer(TAG_FUJIFILM_FLASH_STRENGTH), "Flash Strength");
-        tagNameMap.put(new Integer(TAG_FUJIFILM_FOCUS_MODE), "Focus Mode");
-        tagNameMap.put(new Integer(TAG_FUJIFILM_FOCUS_WARNING), "Focus Warning");
-        tagNameMap.put(new Integer(TAG_FUJIFILM_MACRO), "Macro");
-        tagNameMap.put(new Integer(TAG_FUJIFILM_MAKERNOTE_VERSION), "Makernote Version");
-        tagNameMap.put(new Integer(TAG_FUJIFILM_PICTURE_MODE), "Picture Mode");
-        tagNameMap.put(new Integer(TAG_FUJIFILM_QUALITY), "Quality");
-        tagNameMap.put(new Integer(TAG_FUJIFILM_SHARPNESS), "Sharpness");
-        tagNameMap.put(new Integer(TAG_FUJIFILM_SLOW_SYNCHRO), "Slow Synchro");
-        tagNameMap.put(new Integer(TAG_FUJIFILM_TONE), "Tone");
-        tagNameMap.put(new Integer(TAG_FUJIFILM_UNKNOWN_1), "Makernote Unknown 1");
-        tagNameMap.put(new Integer(TAG_FUJIFILM_UNKNOWN_2), "Makernote Unknown 2");
-        tagNameMap.put(new Integer(TAG_FUJIFILM_WHITE_BALANCE), "White Balance");
+        _tagNameMap.put(TAG_FUJIFILM_MAKERNOTE_VERSION, "Makernote Version");
+        _tagNameMap.put(TAG_FUJIFILM_QUALITY, "Quality");
+        _tagNameMap.put(TAG_FUJIFILM_SHARPNESS, "Sharpness");
+        _tagNameMap.put(TAG_FUJIFILM_WHITE_BALANCE, "White Balance");
+        _tagNameMap.put(TAG_FUJIFILM_COLOR_SATURATION, "Color Saturation");
+        _tagNameMap.put(TAG_FUJIFILM_TONE, "Tone (Contrast)");
+        _tagNameMap.put(TAG_FUJIFILM_FLASH_MODE, "Flash Mode");
+        _tagNameMap.put(TAG_FUJIFILM_FLASH_STRENGTH, "Flash Strength");
+        _tagNameMap.put(TAG_FUJIFILM_MACRO, "Macro");
+        _tagNameMap.put(TAG_FUJIFILM_FOCUS_MODE, "Focus Mode");
+        _tagNameMap.put(TAG_FUJIFILM_SLOW_SYNCH, "Slow Synch");
+        _tagNameMap.put(TAG_FUJIFILM_PICTURE_MODE, "Picture Mode");
+        _tagNameMap.put(TAG_FUJIFILM_UNKNOWN_1, "Makernote Unknown 1");
+        _tagNameMap.put(TAG_FUJIFILM_CONTINUOUS_TAKING_OR_AUTO_BRACKETTING, "Continuous Taking Or Auto Bracketting");
+        _tagNameMap.put(TAG_FUJIFILM_UNKNOWN_2, "Makernote Unknown 2");
+        _tagNameMap.put(TAG_FUJIFILM_BLUR_WARNING, "Blur Warning");
+        _tagNameMap.put(TAG_FUJIFILM_FOCUS_WARNING, "Focus Warning");
+        _tagNameMap.put(TAG_FUJIFILM_AE_WARNING, "AE Warning");
     }
 
@@ -74 +82 @@
     }
 
+    @NotNull
     public String getName()
     {
@@ -79 +88 @@
     }
 
-    protected HashMap getTagNameMap()
+    @NotNull
+    protected HashMap<Integer, String> getTagNameMap()
     {
-        return tagNameMap;
+        return _tagNameMap;
     }
 }