Merge pull request #619 from danielsz/master

Fujifilm enhancements
drewnoakes · Aug 7, 2023 · 0672e46 · 0672e46
2 parents e3235ea + de8ca0b
commit 0672e46
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/Source/com/drew/metadata/exif/makernotes/FujifilmMakernoteDescriptor.java b/Source/com/drew/metadata/exif/makernotes/FujifilmMakernoteDescriptor.java
@@ -115,7 +115,7 @@ public String getDescription(int tagType)
     }
 
     @Nullable
-    private String getMakernoteVersionDescription()
+    public String getMakernoteVersionDescription()
     {
         return getVersionBytesDescription(TAG_MAKERNOTE_VERSION, 2);
     }
@@ -444,6 +444,11 @@ public String getFilmModeDescription()
             case 0x400: return "F4/Velvia";
             case 0x500: return "Pro Neg. Std";
             case 0x501: return "Pro Neg. Hi";
+            case 0x600: return "Classic Chrome";
+            case 0x700: return "Eterna";
+            case 0x800: return "Classic Negative";
+            case 0x900: return "Bleach Bypass";
+            case 0xa00: return "Nostalgic Neg";
             default:
                 return "Unknown (" + value + ")";
         }
@@ -467,3 +472,4 @@ public String getDynamicRangeSettingDescription()
         }
     }
 }
+
diff --git a/Source/com/drew/metadata/exif/makernotes/FujifilmMakernoteDirectory.java b/Source/com/drew/metadata/exif/makernotes/FujifilmMakernoteDirectory.java
@@ -93,6 +93,7 @@ public class FujifilmMakernoteDirectory extends Directory
     public static final int TAG_FRAME_NUMBER = 0x8003;
 
     public static final int TAG_PARALLAX = 0xb211;
+    public static final int TAG_IMAGE_NUMBER = 0x1438;
 
     @NotNull
     private static final HashMap<Integer, String> _tagNameMap = new HashMap<Integer, String>();
@@ -156,6 +157,7 @@ public class FujifilmMakernoteDirectory extends Directory
         _tagNameMap.put(TAG_FRAME_NUMBER, "Frame Number");
 
         _tagNameMap.put(TAG_PARALLAX, "Parallax");
+        _tagNameMap.put(TAG_IMAGE_NUMBER, "Image Number");
     }
 
     public FujifilmMakernoteDirectory()