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

The following commit has been merged in the master branch:
commit ed060a7a35fd6e36c364faeeebf7ef47b52c9989
Author: vog <vog at notjusthosting.com>
Date:   Mon Jun 27 12:23:57 2011 +0000

    Fixed isEpsType() to handle size_t / long types in a clean way
---
 src/epsimage.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/epsimage.cpp b/src/epsimage.cpp
index dbb98b5..3f1d93b 100644
--- a/src/epsimage.cpp
+++ b/src/epsimage.cpp
@@ -1068,14 +1068,14 @@ namespace Exiv2
     bool isEpsType(BasicIo& iIo, bool advance)
     {
         // read as many bytes as needed for the longest (DOS) EPS signature
-        size_t bufSize = dosEpsSignature.size();
+        long bufSize = dosEpsSignature.size();
         for (size_t i = 0; i < (sizeof epsFirstLine) / (sizeof *epsFirstLine); i++) {
-            if (bufSize < epsFirstLine[i].size()) {
-                bufSize = epsFirstLine[i].size();
+            if (bufSize < static_cast<long>(epsFirstLine[i].size())) {
+                bufSize = static_cast<long>(epsFirstLine[i].size());
             }
         }
         DataBuf buf = iIo.read(bufSize);
-        if (iIo.error() || iIo.eof()) {
+        if (iIo.error() || buf.size_ != bufSize) {
             return false;
         }
         // check for all possible (DOS) EPS signatures
@@ -1085,7 +1085,7 @@ namespace Exiv2
         }
         // seek back if possible and requested
         if (!advance || !matched) {
-            iIo.seek(-bufSize, BasicIo::cur);
+            iIo.seek(-buf.size_, BasicIo::cur);
         }
         return matched;
     }

-- 
exiv2 packaging