[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=ecedab8

The following commit has been merged in the master branch:
commit ecedab80a5eeb4bbc3a92d43348198620991e17a
Author: Robin Mills <robin at clanmills.com>
Date:   Sun Dec 20 17:30:41 2015 +0000

    #1140.  Correction to r4132.  Modified lens detection condition.
---
 src/canonmn.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index 731b985..69ff814 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -1586,9 +1586,9 @@ namespace Exiv2 {
     {
         try {
             # 1140
-            if( metadata->findKey(ExifKey("Exif.Image.Model"          ))->value().toString() == "Canon EOS 30D"
-            &&  metadata->findKey(ExifKey("Exif.CanonCs.Lens"         ))->value().toString() == "24 24 1"
-            &&  metadata->findKey(ExifKey("Exif.Photo.FocalLength"    ))->value().toString() == "24/1"
+            if( metadata->findKey(ExifKey("Exif.Image.Model"        ))->value().toString() == "Canon EOS 30D"
+            &&  metadata->findKey(ExifKey("Exif.CanonCs.Lens"       ))->value().toString() == "24 24 1"
+            &&  metadata->findKey(ExifKey("Exif.CanonCs.MaxAperture"))->value().toString() == "95" // F2.8
             ){
                 return os << "Canon EF-S 24mm f/2.8 STM" ;
             }

-- 
exiv2 packaging