[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=045f9ba

The following commit has been merged in the master branch:
commit 045f9ba328c0ee848599f7034c968b76b4da1cfb
Author: Robin Mills <robin at clanmills.com>
Date:   Mon Dec 21 17:23:17 2015 +0000

    #816.  Correction to msvc buildbreaker in r4135
---
 src/canonmn.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index 69ff814..91c555e 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -1585,14 +1585,14 @@ namespace Exiv2 {
                                 const ExifData* metadata)
     {
         try {
-            # 1140
+            // 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.CanonCs.MaxAperture"))->value().toString() == "95" // F2.8
             ){
                 return os << "Canon EF-S 24mm f/2.8 STM" ;
             }
-        } catch (std::exception& e) {};
+        } catch (std::exception&) {};
 
         return EXV_PRINT_TAG(canonCsLensType)(os, value, metadata);
     }

-- 
exiv2 packaging