[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=11f5267

The following commit has been merged in the master branch:
commit 11f52679c59850528d3541c53d012449a2332bff
Author: vog <vog at notjusthosting.com>
Date:   Mon Jun 27 11:26:51 2011 +0000

    Fixed isEpsType() to use DataBuf instead of a local allocation on the stack
---
 src/epsimage.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/epsimage.cpp b/src/epsimage.cpp
index 85e02d5..dbb98b5 100644
--- a/src/epsimage.cpp
+++ b/src/epsimage.cpp
@@ -1074,15 +1074,14 @@ namespace Exiv2
                 bufSize = epsFirstLine[i].size();
             }
         }
-        byte buf[bufSize];
-        iIo.read(buf, bufSize);
+        DataBuf buf = iIo.read(bufSize);
         if (iIo.error() || iIo.eof()) {
             return false;
         }
         // check for all possible (DOS) EPS signatures
-        bool matched = (memcmp(buf, dosEpsSignature.data(), dosEpsSignature.size()) == 0);
+        bool matched = (memcmp(buf.pData_, dosEpsSignature.data(), dosEpsSignature.size()) == 0);
         for (size_t i = 0; !matched && i < (sizeof epsFirstLine) / (sizeof *epsFirstLine); i++) {
-            matched = (memcmp(buf, epsFirstLine[i].data(), epsFirstLine[i].size()) == 0);
+            matched = (memcmp(buf.pData_, epsFirstLine[i].data(), epsFirstLine[i].size()) == 0);
         }
         // seek back if possible and requested
         if (!advance || !matched) {

-- 
exiv2 packaging