[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=4355b32

The following commit has been merged in the master branch:
commit 4355b324729d5da49e384aaf009623a2834b0745
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Wed Apr 28 15:20:01 2010 +0000

    #699: Omit all formatting whitespace when encoding XMP for JPEG. (Patch from Joachim Gelhaus)
---
 src/jpgimage.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/jpgimage.cpp b/src/jpgimage.cpp
index 2c97936..84457fd 100644
--- a/src/jpgimage.cpp
+++ b/src/jpgimage.cpp
@@ -696,7 +696,7 @@ namespace Exiv2 {
                     }
                 }
                 if (writeXmpFromPacket() == false) {
-                    if (XmpParser::encode(xmpPacket_, xmpData_) > 1) {
+                    if (XmpParser::encode(xmpPacket_, xmpData_, XmpParser::useCompactFormat | XmpParser::omitAllFormatting) > 1) {
 #ifndef SUPPRESS_WARNINGS
                         std::cerr << "Error: Failed to encode XMP metadata.
";
 #endif

-- 
exiv2 packaging