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

The following commit has been merged in the master branch:
commit f821caf029720f0ad14b131f24bc0a896c9d634b
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Wed Apr 14 16:17:55 2010 +0000

    Another fix similar to r2073 and a minor conversion fix that was exposed by the former.
---
 src/convert.cpp     | 3 ++-
 src/value.cpp       | 5 +++--
 test/conversions.sh | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/convert.cpp b/src/convert.cpp
index dcc05db..0db9bb1 100644
--- a/src/convert.cpp
+++ b/src/convert.cpp
@@ -803,7 +803,8 @@ namespace Exiv2 {
 #endif
                 return;
             }
-            array << value << " ";
+            array << value;
+            if (i != pos->count() - 1) array << " ";
         }
         (*exifData_)[to] = array.str();
         if (erase_) xmpData_->erase(pos);
diff --git a/src/value.cpp b/src/value.cpp
index 28b1b33..d9dbb77 100644
--- a/src/value.cpp
+++ b/src/value.cpp
@@ -194,12 +194,13 @@ namespace Exiv2 {
     {
         std::istringstream is(buf);
         int tmp;
-        value_.clear();
+        ValueType val;
         while (!(is.eof())) {
             is >> tmp;
             if (is.fail()) return 1;
-            value_.push_back(static_cast<byte>(tmp));
+            val.push_back(static_cast<byte>(tmp));
         }
+        value_.swap(val);
         return 0;
     }
 
diff --git a/test/conversions.sh b/test/conversions.sh
index ebfc951..fb153da 100755
--- a/test/conversions.sh
+++ b/test/conversions.sh
@@ -177,7 +177,7 @@ $exiv2 -px t.jpg
 $exiv2 -v -PEkycv t.jpg
 $exiv2 -pi t.jpg
 
-# 10) Convert a few other tags of interest from Exif/IPTC to XMP
+# 14) Convert a few other tags of interest from Exif/IPTC to XMP
 echo
 echo Testcase 14
 echo ===========

-- 
exiv2 packaging