[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=794dede

The following commit has been merged in the master branch:
commit 794dedeac5634b1f6c740bba070335fde85d08a1
Author: Robin Mills <robin at clanmills.com>
Date:   Sat May 7 18:44:02 2016 +0000

    #1034 Sony and Minolta support for ~/.exiv2
---
 src/minoltamn.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/minoltamn.cpp b/src/minoltamn.cpp
index 243cbec..cdef640 100644
--- a/src/minoltamn.cpp
+++ b/src/minoltamn.cpp
@@ -35,6 +35,7 @@ EXIV2_RCSID("@(#) $Id$")
 // included header files
 #include "minoltamn_int.hpp"
 #include "tags_int.hpp"
+#include "makernote_int.hpp"
 #include "value.hpp"
 #include "exif.hpp"
 #include "i18n.h"                // NLS support.
@@ -2196,6 +2197,17 @@ namespace Exiv2 {
 
     std::ostream& printMinoltaSonyLensID(std::ostream& os, const Value& value, const ExifData* metadata)
     {
+		// #1034
+		const std::string undefined("undefined") ;
+		const std::string minolta  ("minolta");
+		const std::string sony     ("sony");
+		if ( Internal::readExiv2Config(minolta,value.toString(),undefined) != undefined ) {
+			return os << Internal::readExiv2Config(minolta,value.toString(),undefined);
+		}
+		if ( Internal::readExiv2Config(sony,value.toString(),undefined) != undefined ) {
+			return os << Internal::readExiv2Config(sony,value.toString(),undefined);
+		}
+
         // #1145 - respect lenses with shared LensID
         unsigned long    index = value.toLong();
         const LensIdFct* lif   = find(lensIdFct,index);

-- 
exiv2 packaging