[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=6d0cfca

The following commit has been merged in the master branch:
commit 6d0cfca1a535bbe5a24208f1bc0d1d262b83dac5
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Mon Oct 15 12:51:04 2007 +0000

    Fix: do not clear old XMP packet in case of an error encoding the new XMP data.
---
 src/jpgimage.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/jpgimage.cpp b/src/jpgimage.cpp
index 3d2c6e8..e2d4721 100644
--- a/src/jpgimage.cpp
+++ b/src/jpgimage.cpp
@@ -526,11 +526,15 @@ namespace Exiv2 {
                     }
                 }
                 if (writeXmpFromPacket() == false) {
-                    if (XmpParser::encode(xmpPacket_, xmpData_)) {
+                    std::string tmpXmpPacket;
+                    if (XmpParser::encode(tmpXmpPacket, xmpData_)) {
 #ifndef SUPPRESS_WARNINGS
-                        std::cerr << "Warning: Failed to encode XMP metadata.
";
+                        std::cerr << "Error: Failed to encode XMP metadata.
";
 #endif
                     }
+                    else {
+                        xmpPacket_ = tmpXmpPacket;
+                    }
                 }
                 if (xmpPacket_.size() > 0) {
                     // Write APP1 marker, size of APP1 field, XMP id and XMP packet

-- 
exiv2 packaging