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

The following commit has been merged in the master branch:
commit e3d2c7491b799f40aa0fa42c50bfa65a28e6684e
Author: vog <vog at notjusthosting.com>
Date:   Mon Jun 20 01:10:37 2011 +0000

    #689: Workaround for handling Exiftool's XMP embedding into EPS
---
 src/epsimage.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/epsimage.cpp b/src/epsimage.cpp
index c4dcd69..41c06dd 100644
--- a/src/epsimage.cpp
+++ b/src/epsimage.cpp
@@ -240,7 +240,7 @@ namespace Exiv2
             const size_t startPos = pos;
             pos = readLine(line, data, startPos, size);
             // implicit comments
-            if (line == "%%EOF" || !(line.size() >= 2 && line[0] == '%' && '\x21' <= line[1] && line[1] <= '\x7e')) {
+            if (line == "%%EOF" || line == "%begin_xml_code" || !(line.size() >= 2 && line[0] == '%' && '\x21' <= line[1] && line[1] <= '\x7e')) {
                 if (posEndComments == size) {
                     posEndComments = startPos;
                     #ifdef DEBUG

-- 
exiv2 packaging