[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=99489c2

The following commit has been merged in the master branch:
commit 99489c2d50ea485cb04321cf79f95669746ff200
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Wed Jun 18 15:37:56 2008 +0000

    #560: XmpParser::encode(): Clear xmpPacket if xmpData is empty.
---
 src/xmp.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/xmp.cpp b/src/xmp.cpp
index 2f4fb7f..6afe164 100644
--- a/src/xmp.cpp
+++ b/src/xmp.cpp
@@ -576,7 +576,10 @@ namespace Exiv2 {
                                 uint16_t     formatFlags,
                                 uint32_t     padding)
     { try {
-        if (xmpData.empty()) return 0;
+        if (xmpData.empty()) {
+            xmpPacket.clear();
+            return 0;
+        }
 
         if (!initialize()) {
 #ifndef SUPPRESS_WARNINGS

-- 
exiv2 packaging