Add camera models for NikonFl3 makernotes group (#1994)

* Add camera models for NikonFl3 * Python test for new NikonFl3 camera models
Exiv2 · Nov 8, 2021 · 1ae9f42 · 1ae9f42
1 parent 7c8e6fc
commit 1ae9f42
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 0 deletions.
diff --git a/src/makernote_int.cpp b/src/makernote_int.cpp
@@ -1139,6 +1139,8 @@ namespace Exiv2 {
         { 0x00a8, "0101",    0, 0,  NA },
         { 0x00a8, "0102",    0, 1,  NA },
         { 0x00a8, "0103",    0, 2,  NA },
+        { 0x00a8, "0104",    0, 2,  NA },
+        { 0x00a8, "0105",    0, 2,  NA },
         { 0x00a8, "0107",    0, 3,  NA },
         { 0x00a8, "0108",    0, 3,  NA },
     };

diff --git a/test/data/pr_1994_poc1.jpg b/test/data/pr_1994_poc1.jpg
diff --git a/test/data/pr_1994_poc2.jpg b/test/data/pr_1994_poc2.jpg
diff --git a/tests/bugfixes/github/test_pr_1994.py b/tests/bugfixes/github/test_pr_1994.py
@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+
+import system_tests
+from system_tests import CaseMeta, path
+
+class TestAddModelsForNikonFl3(metaclass=CaseMeta):
+    """
+    Enables NikonFl3 group to be used by more camera models
+    """
+
+    filename1 = path("$data_path/pr_1994_poc1.jpg")
+    filename2 = path("$data_path/pr_1994_poc2.jpg")
+    commands = ["$exiv2 --grep NikonFl3 $filename1",
+                "$exiv2 --grep NikonFl3 $filename2"
+               ]
+    stdout = ["""Exif.NikonFl3.Version                        Undefined   4  1.04
+Exif.NikonFl3.FlashSource                    Byte        1  None
+Exif.NikonFl3.ExternalFlashFirmware          Short       1  n/a
+Exif.NikonFl3.ExternalFlashFlags             Byte        1  Fired
+Exif.NikonFl3.FlashFocalLength               Byte        1  n/a
+Exif.NikonFl3.RepeatingFlashRate             Byte        1  n/a
+Exif.NikonFl3.RepeatingFlashCount            Byte        1  n/a
+Exif.NikonFl3.FlashGNDistance                Byte        1  None
+Exif.NikonFl3.FlashColorFilter               Byte        1  None
+""",
+"""Exif.NikonFl3.Version                        Undefined   4  1.05
+Exif.NikonFl3.FlashSource                    Byte        1  None
+Exif.NikonFl3.ExternalFlashFirmware          Short       1  n/a
+Exif.NikonFl3.ExternalFlashFlags             Byte        1  Fired
+Exif.NikonFl3.FlashFocalLength               Byte        1  n/a
+Exif.NikonFl3.RepeatingFlashRate             Byte        1  n/a
+Exif.NikonFl3.RepeatingFlashCount            Byte        1  n/a
+Exif.NikonFl3.FlashGNDistance                Byte        1  None
+Exif.NikonFl3.FlashColorFilter               Byte        1  None
+"""]
+    stderr = [""]*2
+    retval = [0]*2
+