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

The following commit has been merged in the master branch:
commit e3b26b97bad702305bda2de0d5b67f56aa78e455
Author: Robin Mills <robin at clanmills.com>
Date:   Wed Apr 8 21:32:04 2015 +0000

    #774.  Thanks to Alan for resolving this matter and providing the patch.
---
 src/xmpsidecar.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/xmpsidecar.cpp b/src/xmpsidecar.cpp
index da349b6..77c9b79 100644
--- a/src/xmpsidecar.cpp
+++ b/src/xmpsidecar.cpp
@@ -47,8 +47,9 @@ EXIV2_RCSID("@(#) $Id$")
 
 // *****************************************************************************
 namespace {
-    const char* xmlHeader = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
";
-    const long  xmlHdrCnt = 39; // without the trailing 0-character
+    const char* xmlHeader = "<?xpacket begin=\"\xef\xbb\xbf\" id=\"W5M0MpCehiHzreSzNTczkc9d\"?>
";
+    const long  xmlHdrCnt = std::strlen(xmlHeader); // without the trailing 0-character
+    const char* xmlFooter = "<?xpacket end=\"w\"?>";
 }
 
 // class member definitions
@@ -130,7 +131,7 @@ namespace Exiv2 {
         }
         if (xmpPacket_.size() > 0) {
             if (xmpPacket_.substr(0, 5)  != "<?xml") {
-                xmpPacket_ = xmlHeader + xmpPacket_;
+                xmpPacket_ = xmlHeader + xmpPacket_ + xmlFooter;
             }
             BasicIo::AutoPtr tempIo(io_->temporary()); // may throw
             assert(tempIo.get() != 0);

-- 
exiv2 packaging