[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=5e578f3

The following commit has been merged in the master branch:
commit 5e578f3ef6aa77439f9934bbdf4a549b0f5812b1
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Wed Sep 16 11:19:49 2009 +0000

    #645: Catch XMP-SDK exception from date conversion. (Vladimir Nadvornik)
---
 src/convert.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/convert.cpp b/src/convert.cpp
index fd1bb2a..952bd19 100644
--- a/src/convert.cpp
+++ b/src/convert.cpp
@@ -809,7 +809,15 @@ namespace Exiv2 {
             return;
         }
         XMP_DateTime datetime;
-        SXMPUtils::ConvertToDate(value, &datetime);
+        try {
+            SXMPUtils::ConvertToDate(value, &datetime);
+        }
+        catch (const XMP_Error& e) {
+#ifndef SUPPRESS_WARNINGS
+            std::cerr << "Warning: Failed to convert " << from << " to " << to << " (" << e.GetErrMsg() << ")
";
+#endif
+            return;
+        }
         char buf[30];
         if (std::string(to) != "Exif.GPSInfo.GPSTimeStamp") {
 

-- 
exiv2 packaging