[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=8551d74

The following commit has been merged in the master branch:
commit 8551d74d224ae1ac915ec39c009b78fc5e14c453
Author: Robin Mills <robin at clanmills.com>
Date:   Sun Dec 27 18:29:38 2015 +0000

    #1144 Fix submitted.  r4147.
---
 src/pentaxmn.cpp | 48 ++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 42 insertions(+), 6 deletions(-)

diff --git a/src/pentaxmn.cpp b/src/pentaxmn.cpp
index dd3f1d4..72af30e 100644
--- a/src/pentaxmn.cpp
+++ b/src/pentaxmn.cpp
@@ -1147,19 +1147,55 @@ namespace Exiv2 {
         return os;
     }
 
-    // ----------------------------------------------------------------------
+    // #1144 begin
+    static ExifData::const_iterator getKey(const std::string& key,const ExifData* metadata)
+    {
+		return metadata->findKey(ExifKey(key));
+    }
+
+    static std::string getKeyString(const std::string& key,const ExifData* metadata)
+    {
+		std::string result;
+		if ( metadata->findKey(ExifKey(key)) != metadata->end() ) {
+			result = metadata->findKey(ExifKey(key))->toString();
+		}
+		return result;
+    }
+
+    std::ostream& resolveLensType0x32c(std::ostream& os, const Value& value,
+                                                 const ExifData* metadata)
+    {
+        try {
+            unsigned long lensID    = 0x32c;
+            unsigned long index     = 0;
+
+            std::string model       = getKeyString("Exif.Image.Model"      ,metadata);
+            std::string focalLength = getKeyString("Exif.Photo.FocalLength",metadata);
+
+            // std::cout << "model,focalLength = " << model << "," << focalLength << std::endl;
+
+            if ( model.find("PENTAX K10D") != std::string::npos && focalLength == "1700/100" ) index = 1;
+
+            if ( index > 0 )  {
+                const TagDetails* td = find(pentaxLensType, lensID);
+                os << exvGettext(td[index].label_);
+                return os;
+            }
+        } catch (...) {}
+        return EXV_PRINT_COMBITAG_MULTI(pentaxLensType, 2, 1, 2)(os, value, metadata);
+    }
+    // #1144 end
+
     // #816 begin
     std::ostream& resolveLensTypeSigma(std::ostream& os, const Value& value,
                                                  const ExifData* metadata)
+    // ----------------------------------------------------------------------
     {
         try {
             unsigned long lensID = value.toLong(0)*256 + value.toLong(1); // 0x3ff
             unsigned long index  = 0;
 
-            const ExifData::const_iterator lensInfo = metadata->findKey(ExifKey("Exif.PentaxDng.LensInfo")) != metadata->end()
-                                                    ? metadata->findKey(ExifKey("Exif.PentaxDng.LensInfo"))
-                                                    : metadata->findKey(ExifKey("Exif.Pentax.LensInfo"))
-                                                    ;
+            const ExifData::const_iterator lensInfo = getKey("Exif.PentaxDng.LensInfo",metadata);
             if ( lensInfo == metadata->end() ) return EXV_PRINT_COMBITAG_MULTI(pentaxLensType, 2, 1, 2)(os, value, metadata);
             if ( lensInfo->count() < 5       ) return EXV_PRINT_COMBITAG_MULTI(pentaxLensType, 2, 1, 2)(os, value, metadata);
 
@@ -1224,7 +1260,7 @@ namespace Exiv2 {
        {   0x031d, resolveLensType },
        {   0x031f, resolveLensType },
        {   0x0329, resolveLensType },
-       {   0x032c, resolveLensType },
+       {   0x032c, resolveLensType0x32c },
        {   0x032e, resolveLensType },
        {   0x0334, resolveLensType },
        {   0x03ff, resolveLensTypeSigma },

-- 
exiv2 packaging