add shutter mode and mechanical shutter count to nikon makernote 3

Author: hassec

src/nikonmn_int.cpp

@@ -589,6 +589,8 @@ namespace Exiv2 {
         TagInfo(0x0024, "WorldTime", N_("World Time"), N_("World time"), nikon3Id, makerTags, undefined, -1, printValue),
         TagInfo(0x0025, "ISOInfo", N_("ISO Info"), N_("ISO info"), nikon3Id, makerTags, undefined, -1, printValue),
         TagInfo(0x002a, "VignetteControl", N_("Vignette Control"), N_("Vignette control"), nikon3Id, makerTags, unsignedShort, -1, EXV_PRINT_TAG(nikonOlnh)),
+        TagInfo(0x0034, "ShutterMode", N_("Shutter Mode"), N_("Shutter mode"), nikon3Id, makerTags, unsignedShort, -1, print0x0034),
+        TagInfo(0x0037, "MechanicalShutterCount", N_("Mechanical Shutter Count"), N_("Mechanical shutter count"), nikon3Id, makerTags, unsignedLong, -1, printValue),
         TagInfo(0x0080, "ImageAdjustment", N_("Image Adjustment"), N_("Image adjustment setting"), nikon3Id, makerTags, asciiString, -1, printValue),
         TagInfo(0x0081, "ToneComp", N_("Tone Compensation"), N_("Tone compensation"), nikon3Id, makerTags, asciiString, -1, printValue),
         TagInfo(0x0082, "AuxiliaryLens", N_("Auxiliary Lens"), N_("Auxiliary lens (adapter)"), nikon3Id, makerTags, asciiString, -1, printValue),
@@ -1529,6 +1531,30 @@ namespace Exiv2 {
         return os;
     }
 
+    // shutter mode value conversions, taken from exiftool
+    std::ostream& Nikon3MakerNote::print0x0034(std::ostream& os,
+                                               const Value& value,
+                                               const ExifData*)
+    {
+        long focus = value.toLong();
+        switch (focus) {
+          case 0: os << "Mechanical";
+            break;
+          case 16: os << "Electronic";
+            break;
+          case 48: os << "Electronic Front Curtain";
+            break;
+          case 64: os << "Electronic (Movie)";
+            break;
+          case 80: os << "Auto (Mechanical)";
+            break;
+          case 81: os << "Auto (Electronic Front Curtain)";
+            break;
+          default: os << "Unknown Shutter Mode";
+        }
+        return os;
+    }
+
     std::ostream& Nikon3MakerNote::print0x0083(std::ostream& os,
                                                const Value& value,
                                                const ExifData*)

src/nikonmn_int.hpp

@@ -176,6 +176,8 @@ namespace Exiv2 {
         static std::ostream& print0x0002(std::ostream& os, const Value& value, const ExifData*);
         //! Print autofocus mode
         static std::ostream& print0x0007(std::ostream& os, const Value& value, const ExifData*);
+        //! Print shutter mode
+        static std::ostream& print0x0034(std::ostream& os, const Value& value, const ExifData*);
         //! Print lens type
         static std::ostream& print0x0083(std::ostream& os, const Value& value, const ExifData*);
         //! Print lens information

tests/bugfixes/github/test_pr_1444.py

@@ -0,0 +1,14 @@
+# -*- coding: utf-8 -*-
+
+import system_tests
+
+class Nikon_ShutterMode_MechShutterCount(metaclass=system_tests.CaseMeta):
+    url      = "https://github.com/Exiv2/exiv2/pull/1444"
+    filename = "$data_path/CH0_0174.exv"
+    commands = ["$exiv2 -g shutter/i $filename"]
+    stderr   = [""]
+    stdout   = ["""Exif.Nikon3.ShutterMode                      Short       1  Auto (Electronic Front Curtain)
+Exif.Nikon3.MechanicalShutterCount           Long        1  174
+Exif.Nikon3.ShutterCount                     Long        1  174
+"""]
+    retval = [0]