[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=8c7fffd

The following commit has been merged in the master branch:
commit 8c7fffdc7d8874200c47c8c2c3c19465883b142c
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sat Apr 3 03:21:02 2010 +0000

    Fixed compilation error on MSVC when SUPPRESS_WARNINGS is defined. (Thomas Beutlich)
---
 src/convert.cpp |  8 ++++++--
 src/xmp.cpp     | 23 +++++++++++++++++------
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/src/convert.cpp b/src/convert.cpp
index 217632e..f0c3380 100644
--- a/src/convert.cpp
+++ b/src/convert.cpp
@@ -826,12 +826,16 @@ namespace Exiv2 {
         try {
             SXMPUtils::ConvertToDate(value, &datetime);
         }
-        catch (const XMP_Error& e) {
 #ifndef SUPPRESS_WARNINGS
+        catch (const XMP_Error& e) {
             std::cerr << "Warning: Failed to convert " << from << " to " << to << " (" << e.GetErrMsg() << ")
";
-#endif
             return;
         }
+#else
+        catch (const XMP_Error&) {
+            return;
+        }
+#endif // SUPPRESS_WARNINGS
         char buf[30];
         if (std::string(to) != "Exif.GPSInfo.GPSTimeStamp") {
 
diff --git a/src/xmp.cpp b/src/xmp.cpp
index 4594f7c..936c989 100644
--- a/src/xmp.cpp
+++ b/src/xmp.cpp
@@ -566,13 +566,19 @@ namespace Exiv2 {
 
         return 0;
     }
-    catch (const XMP_Error& e) {
 #ifndef SUPPRESS_WARNINGS
+    catch (const XMP_Error& e) {
         std::cerr << Error(40, e.GetID(), e.GetErrMsg()) << "
";
-#endif
         xmpData.clear();
         return 3;
-    }} // XmpParser::decode
+    }
+#else
+    catch (const XMP_Error&) {
+        xmpData.clear();
+        return 3;
+    }
+#endif // SUPPRESS_WARNINGS
+    } // XmpParser::decode
 #else
     int XmpParser::decode(      XmpData&     xmpData,
                           const std::string& xmpPacket)
@@ -681,12 +687,17 @@ namespace Exiv2 {
 
         return 0;
     }
-    catch (const XMP_Error& e) {
 #ifndef SUPPRESS_WARNINGS
+    catch (const XMP_Error& e) {
         std::cerr << Error(40, e.GetID(), e.GetErrMsg()) << "
";
-#endif
         return 3;
-    }} // XmpParser::decode
+    }
+#else
+    catch (const XMP_Error& e) {
+        return 3;
+    }
+#endif // SUPPRESS_WARNINGS
+    } // XmpParser::decode
 #else
     int XmpParser::encode(      std::string& /*xmpPacket*/,
                           const XmpData&     xmpData,

-- 
exiv2 packaging