[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=579bc91

The following commit has been merged in the master branch:
commit 579bc918214b233ee54c59a13c277474199b697d
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sun Dec 9 08:01:43 2007 +0000

    Minor changes.
---
 src/iptc.cpp | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/iptc.cpp b/src/iptc.cpp
index 7ff3227..d022c99 100644
--- a/src/iptc.cpp
+++ b/src/iptc.cpp
@@ -133,6 +133,9 @@ namespace Exiv2 {
 
     int IptcData::load(const byte* buf, long len)
     {
+#ifdef DEBUG
+        std::cerr << "IptcData::load, len = " << len << "
";
+#endif
         const byte* pRead = buf;
         iptcMetadata_.clear();
 
@@ -166,7 +169,15 @@ namespace Exiv2 {
                 pRead += 2;
             }
             if (pRead + sizeData <= buf + len) {
-                readData(dataSet, record, pRead, sizeData);
+                int rc = 0;
+                if ((rc = readData(dataSet, record, pRead, sizeData)) != 0) {
+#ifndef SUPPRESS_WARNINGS
+                    std::cerr << "Warning: "
+                              << "Failed to read IPTC dataset "
+                              << IptcKey(dataSet, record)
+                              << " (rc = " << rc << "); skipped.
";
+#endif
+                }
             }
 #ifndef SUPPRESS_WARNINGS
             else {
@@ -195,7 +206,7 @@ namespace Exiv2 {
         else if (1 == rc) {
             // If the first attempt failed, try with a string value
             value = Value::create(string);
-            int rc = value->read(data, sizeData, bigEndian);
+            rc = value->read(data, sizeData, bigEndian);
             if (0 == rc) {
                 IptcKey key(dataSet, record);
                 add(key, value.get());

-- 
exiv2 packaging