[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=1a40740

The following commit has been merged in the master branch:
commit 1a407407d8effd26f88d6ebd5904822e6cccad7b
Author: vog <vog at notjusthosting.com>
Date:   Mon Jun 27 14:03:39 2011 +0000

    #689: Improved coding style of EpsImage
---
 src/epsimage.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/epsimage.cpp b/src/epsimage.cpp
index 7733cf6..4278510 100644
--- a/src/epsimage.cpp
+++ b/src/epsimage.cpp
@@ -441,12 +441,13 @@ namespace {
             sizeWmf   = getULong(data + 16, littleEndian);
             posTiff   = getULong(data + 20, littleEndian);
             sizeTiff  = getULong(data + 24, littleEndian);
+            const uint16_t checksum = getUShort(data + 28, littleEndian);
             #ifdef DEBUG
             EXV_DEBUG << "readWriteEpsMetadata: EPS section at position " << posEps << ", size " << (posEndEps - posEps) << "
";
             EXV_DEBUG << "readWriteEpsMetadata: WMF section at position " << posWmf << ", size " << sizeWmf << "
";
             EXV_DEBUG << "readWriteEpsMetadata: TIFF section at position " << posTiff << ", size " << sizeTiff << "
";
             #endif
-            if (!(data[28] == 0xFF && data[29] == 0xFF)) {
+            if (checksum != 0xFFFF) {
                 #ifdef DEBUG
                 EXV_DEBUG << "readWriteEpsMetadata: DOS EPS checksum is not FFFF
";
                 #endif

-- 
exiv2 packaging