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

The following commit has been merged in the master branch:
commit c626d7caec88f9eeb7c41cb39c4f0738cf4c70a9
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Wed Apr 14 16:33:38 2010 +0000

    #693: Applied patch from Nikolai Saoukh.
---
 src/psdimage.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/psdimage.cpp b/src/psdimage.cpp
index 85b18cd..2d3540e 100644
--- a/src/psdimage.cpp
+++ b/src/psdimage.cpp
@@ -363,7 +363,7 @@ namespace Exiv2 {
         long toRead = 0;
         while (readTotal < colorDataLength) {
             toRead =   static_cast<long>(colorDataLength - readTotal) < lbuf.size_
-                     ? colorDataLength - readTotal : lbuf.size_;
+                     ? static_cast<long>(colorDataLength - readTotal) : lbuf.size_;
             if (io_->read(lbuf.pData_, toRead) != toRead) throw Error(3, "Photoshop");
             readTotal += toRead;
             if (outIo.write(lbuf.pData_, toRead) != toRead) throw Error(21);
@@ -470,7 +470,7 @@ namespace Exiv2 {
                 resourceSize = (resourceSize + 1) & ~1;        // pad to even
                 while (readTotal < resourceSize) {
                     toRead =   static_cast<long>(resourceSize - readTotal) < lbuf.size_
-                             ? resourceSize - readTotal : lbuf.size_;
+                             ? static_cast<long>(resourceSize - readTotal) : lbuf.size_;
                     if (io_->read(lbuf.pData_, toRead) != toRead) {
                         throw Error(3, "Photoshop");
                     }

-- 
exiv2 packaging