[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=81cd21a

The following commit has been merged in the master branch:
commit 81cd21a3754f470d4b41c1ce3751389a75f16669
Author: Robin Mills <robin at clanmills.com>
Date:   Tue Jun 14 21:25:23 2016 +0000

    #1034 and #867.  Adding support for "Camera Overflow File" for olympus cameras.
---
 src/olympusmn.cpp | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/olympusmn.cpp b/src/olympusmn.cpp
index e6aa0be..ca8066a 100644
--- a/src/olympusmn.cpp
+++ b/src/olympusmn.cpp
@@ -40,6 +40,7 @@ EXIV2_RCSID("@(#) $Id$")
 #include "value.hpp"
 #include "image.hpp"
 #include "tags_int.hpp"
+#include "makernote_int.hpp"
 #include "i18n.h"                // NLS support.
 
 // + standard includes
@@ -1251,6 +1252,13 @@ namespace Exiv2 {
     //! OlympusEq LensType, tag 0x201
     std::ostream& OlympusMakerNote::print0x0201(std::ostream& os, const Value& value, const ExifData*)
     {
+    	// #1034
+		const std::string undefined("undefined") ;
+		const std::string section  ("olympus");
+		if ( Internal::readExiv2Config(section,value.toString(),undefined) != undefined ) {
+			return os << Internal::readExiv2Config(section,value.toString(),undefined);
+		}
+
         // 6 numbers: 0. Make, 1. Unknown, 2. Model, 3. Sub-model, 4-5. Unknown.
         // Only the Make, Model and Sub-model are used to determine the lens model
         static struct {
@@ -1589,7 +1597,7 @@ namespace Exiv2 {
             os.flags(f);
             return os << value;
         }
-        
+
         Rational distance = value.toRational();
         if(static_cast<uint32_t>(distance.first) == 0xffffffff) {
             os << _("Infinity");
@@ -1599,12 +1607,12 @@ namespace Exiv2 {
             oss.copyfmt(os);
             os << std::fixed << std::setprecision(2);
             os << (float)distance.first/1000 << " m";
-            os.copyfmt(oss); 
+            os.copyfmt(oss);
         }
         os.flags(f);
         return os;
     }
-    
+
     // Olympus FocusInfo tag 0x0308 AFPoint
     std::ostream& OlympusMakerNote::print0x0308(std::ostream& os, const Value&
 value, const ExifData* metadata)

-- 
exiv2 packaging