[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=e5bc22c

The following commit has been merged in the master branch:
commit e5bc22c0a893fd4a8314c7945d2b4d94c88697f5
Author: Robin Mills <robin at clanmills.com>
Date:   Tue Aug 9 20:55:44 2016 +0000

    #1200 and #1034.  Adding support for ~/.exiv2 for Nikon Cameras.
---
 src/nikonmn.cpp | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/nikonmn.cpp b/src/nikonmn.cpp
index 162d65f..59caa2d 100644
--- a/src/nikonmn.cpp
+++ b/src/nikonmn.cpp
@@ -1705,25 +1705,38 @@ namespace Exiv2 {
         return os << a * b / c;
     }
 
+    static bool testConfigFile(std::ostream& os,const Value& value);
+    static bool testConfigFile(std::ostream& os,const Value& value)
+    {
+    	bool result = false;
+		const std::string undefined("undefined") ;
+		const std::string section  ("nikon");
+		if ( Internal::readExiv2Config(section,value.toString(),undefined) != undefined ) {
+			os << Internal::readExiv2Config(section,value.toString(),undefined);
+			result = true;
+		}
+		return result;
+	}
+
     std::ostream& Nikon3MakerNote::printLensId1(std::ostream& os,
                                                 const Value& value,
                                                 const ExifData* metadata)
     {
-        return printLensId(os, value, metadata, "NikonLd1");
+        return testConfigFile(os,value) ? os : printLensId(os, value, metadata, "NikonLd1");
     }
 
     std::ostream& Nikon3MakerNote::printLensId2(std::ostream& os,
                                                 const Value& value,
                                                 const ExifData* metadata)
     {
-        return printLensId(os, value, metadata, "NikonLd2");
+        return testConfigFile(os,value) ? os : printLensId(os, value, metadata, "NikonLd2");
     }
 
     std::ostream& Nikon3MakerNote::printLensId3(std::ostream& os,
                                                 const Value& value,
                                                 const ExifData* metadata)
     {
-        return printLensId(os, value, metadata, "NikonLd3");
+        return testConfigFile(os,value) ? os : printLensId(os, value, metadata, "NikonLd3");
     }
 
     std::ostream& Nikon3MakerNote::printLensId(std::ostream& os,

-- 
exiv2 packaging