[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=46d3e53

The following commit has been merged in the master branch:
commit 46d3e533237925e74c6ad2feb51b2541fb8cfbca
Author: Robin Mills <robin at clanmills.com>
Date:   Sat May 7 16:40:13 2016 +0000

    #1034.  Nikon support for ~/.exiv2
---
 src/nikonmn.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/nikonmn.cpp b/src/nikonmn.cpp
index 3882a17..5a4b03d 100644
--- a/src/nikonmn.cpp
+++ b/src/nikonmn.cpp
@@ -41,6 +41,7 @@ EXIV2_RCSID("@(#) $Id$")
 #include "value.hpp"
 #include "image.hpp"
 #include "tags_int.hpp"
+#include "makernote_int.hpp"
 #include "error.hpp"
 #include "i18n.h"                // NLS support.
 
@@ -2461,6 +2462,17 @@ fmountlens[] = {
         raw[7] = static_cast<byte>(md->toLong());
 
         for (int i = 0; fmountlens[i].lensname != NULL; ++i) {
+            if (   raw[0] == fmountlens[i].lid ) {
+                // #1034
+                const std::string  undefined("undefined") ;
+                const std::string  section  ("nikon");
+                std::ostringstream lensIDStream;
+                lensIDStream  << (int) raw[7];
+                if ( Internal::readExiv2Config(section,lensIDStream.str(),undefined) != undefined ) {
+                    return os << Internal::readExiv2Config(section,lensIDStream.str(),undefined);
+                }
+            }
+            
             if (   raw[0] == fmountlens[i].lid
                 // stps varies with focal length for some Sigma zoom lenses.
                 &&(raw[1] == fmountlens[i].stps || strcmp(fmountlens[i].manuf, "Sigma") == 0)

-- 
exiv2 packaging