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

The following commit has been merged in the master branch:
commit 7cdfa9bb9a0fa18338a12699dfbc8afbec1500cc
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Fri Jun 2 15:29:31 2006 +0000

    Fixed MSVC compilation errors
---
 src/jpgimage.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/jpgimage.cpp b/src/jpgimage.cpp
index 15f66ec..b70ea45 100644
--- a/src/jpgimage.cpp
+++ b/src/jpgimage.cpp
@@ -166,7 +166,7 @@ namespace Exiv2 {
             append(psBlob, record + sizeOldData, sizeEnd);
         }
         DataBuf rc;
-        if (psBlob.size() > 0) rc = DataBuf(&psBlob[0], psBlob.size());
+        if (psBlob.size() > 0) rc = DataBuf(&psBlob[0], static_cast<long>(psBlob.size()));
 #ifdef DEBUG
         std::cerr << "IRB block at the end of Photoshop::setIptcIrb
";
         if (rc.size_ == 0) std::cerr << "  None.
";
@@ -499,7 +499,7 @@ namespace Exiv2 {
                         // Write APP13 marker, new size, and ps3Id
                         tmpBuf[0] = 0xff;
                         tmpBuf[1] = app13_;
-                        us2Data(tmpBuf + 2, newPsData.size_ + 16, bigEndian);
+                        us2Data(tmpBuf + 2, static_cast<uint16_t>(newPsData.size_ + 16), bigEndian);
                         memcpy(tmpBuf + 4, Photoshop::ps3Id_, 14);
                         if (outIo.write(tmpBuf, 18) != 18) throw Error(21);
                         if (outIo.error()) throw Error(21);

-- 
exiv2 packaging