From f19ed97fe674eb991503e43491c0901b46968b5f Mon Sep 17 00:00:00 2001 From: Daniel Szmulewicz Date: Mon, 7 Aug 2023 08:37:14 +0300 Subject: [PATCH 1/2] Fujifilm enhancements - This commit adds the ability to retrieve the image actuation for Fuji cameras - Also completes the list of Film simulations - Also makes the method getMakerNoteVersionDescription public --- .../makernotes/FujifilmMakernoteDescriptor.java | 14 +++++++++++++- .../makernotes/FujifilmMakernoteDirectory.java | 2 ++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/Source/com/drew/metadata/exif/makernotes/FujifilmMakernoteDescriptor.java b/Source/com/drew/metadata/exif/makernotes/FujifilmMakernoteDescriptor.java index cbe36c593..01adacc61 100644 --- 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 + ")"; } @@ -466,4 +471,11 @@ public String getDynamicRangeSettingDescription() return "Unknown (" + value + ")"; } } + @Nullable + public int getImageNumber() + { + final Integer value = _directory.getInteger(TAG_IMAGE_NUMBER); + return value; + } } + diff --git a/Source/com/drew/metadata/exif/makernotes/FujifilmMakernoteDirectory.java b/Source/com/drew/metadata/exif/makernotes/FujifilmMakernoteDirectory.java index 42ebd9eab..9bd18b7b2 100644 --- 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 _tagNameMap = new HashMap(); @@ -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() From de8ca0bdc88df0807170a8bc6d63e1502d20a642 Mon Sep 17 00:00:00 2001 From: Daniel Szmulewicz Date: Mon, 7 Aug 2023 12:23:54 +0300 Subject: [PATCH 2/2] Removed method as per author's explanation Fully agreed BTW --- .../exif/makernotes/FujifilmMakernoteDescriptor.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Source/com/drew/metadata/exif/makernotes/FujifilmMakernoteDescriptor.java b/Source/com/drew/metadata/exif/makernotes/FujifilmMakernoteDescriptor.java index 01adacc61..1f32aa302 100644 --- a/Source/com/drew/metadata/exif/makernotes/FujifilmMakernoteDescriptor.java +++ b/Source/com/drew/metadata/exif/makernotes/FujifilmMakernoteDescriptor.java @@ -471,11 +471,5 @@ public String getDynamicRangeSettingDescription() return "Unknown (" + value + ")"; } } - @Nullable - public int getImageNumber() - { - final Integer value = _directory.getInteger(TAG_IMAGE_NUMBER); - return value; - } }