#1225 Fix

src/nikonmn.cpp

@@ -285,6 +285,16 @@ namespace Exiv2 {
         return os;
     }
 
+    std::ostream& Nikon1MakerNote::printBarValue(std::ostream& os,
+                                               const Value& value,
+                                               const ExifData*)
+    {
+        if (value.count() > 1) {
+            os << value.toLong(6)+value.toLong(7)*256;
+        }
+        return os;
+    }
+
     std::ostream& Nikon1MakerNote::print0x0007(std::ostream& os,
                                                const Value& value,
                                                const ExifData*)
@@ -613,6 +623,7 @@ namespace Exiv2 {
         TagInfo(0x00b7, "AFInfo2", "AF Info 2", N_("AF info 2"), nikon3Id, makerTags, undefined, -1, printValue),
         TagInfo(0x00b8, "FileInfo", "File Info", N_("File info"), nikon3Id, makerTags, undefined, -1, printValue),
         TagInfo(0x00b9, "AFTune", "AF Tune", N_("AF tune"), nikon3Id, makerTags, undefined, -1, printValue),
+        TagInfo(0x00c3, "BarometerInfo", "BarometerInfo", N_("Barometer Info"), nikon3Id, makerTags, signedLong, -1, Nikon1MakerNote::printBarValue),
         TagInfo(0x0e00, "PrintIM", N_("Print IM"), N_("PrintIM information"), nikon3Id, makerTags, undefined, -1, printValue),
         // TODO: Add Capture Data decoding implementation.
         TagInfo(0x0e01, "CaptureData", N_("Capture Data"), N_("Capture data"), nikon3Id, makerTags, undefined, -1, printValue),

src/nikonmn_int.hpp

@@ -79,6 +79,8 @@ namespace Exiv2 {
         static std::ostream& print0x0086(std::ostream& os, const Value& value, const ExifData*);
         //! Print AF focus position
         static std::ostream& print0x0088(std::ostream& os, const Value& value, const ExifData*);
+        //! Print BarometerInfo
+        static std::ostream& printBarValue(std::ostream& os, const Value& value, const ExifData*);
         //@}
 
     private:

test/bugfixes-test.sh

@@ -575,6 +575,12 @@ source ./functions.source
     runTest exiv2 -pa --grep Shutter    RAW_PENTAX_K30.exv
     runTest exiv2 -pa --grep Shutter    RAW_PENTAX_K100.exv
 
+    num=1225
+    printf "$num " >&3
+    filename=exiv2-bug$num.exv
+    copyTestFile                        $filename
+    runTest exiv2 -pa --grep Bar        $filename
+
 ) 3>&1 > $results 2>&1
 
 printf "\n"