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

The following commit has been merged in the master branch:
commit e4475fb45383137f2a2adfa947545fa4743122e6
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Thu Sep 1 07:58:45 2011 +0000

    Casts added to make 64bit MSVC compiler happy.
---
 src/epsimage.cpp | 4 ++--
 src/preview.cpp  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/epsimage.cpp b/src/epsimage.cpp
index 2131724..fd98925 100644
--- a/src/epsimage.cpp
+++ b/src/epsimage.cpp
@@ -767,7 +767,7 @@ namespace {
                 std::string type;
                 lineStreamBeginData >> type;
                 nativePreview.position_ = static_cast<long>(posAfterBeginData);
-                nativePreview.size_ = posAi7ThumbnailEndData - posAfterBeginData;
+                nativePreview.size_ = static_cast<uint32_t>(posAi7ThumbnailEndData - posAfterBeginData);
                 nativePreview.filter_ = "hex-ai7thumbnail-pnm";
                 nativePreview.mimeType_ = "image/x-portable-anymap";
                 if (depth != "8") {
@@ -789,7 +789,7 @@ namespace {
             if (posEndPhotoshop != posEndEps) {
                 NativePreview nativePreview;
                 nativePreview.position_ = static_cast<long>(posBeginPhotoshop);
-                nativePreview.size_ = posEndPhotoshop - posBeginPhotoshop;
+                nativePreview.size_ = static_cast<uint32_t>(posEndPhotoshop - posBeginPhotoshop);
                 nativePreview.width_ = 0;
                 nativePreview.height_ = 0;
                 nativePreview.filter_ = "hex-irb";
diff --git a/src/preview.cpp b/src/preview.cpp
index e3714ab..b4f79f0 100644
--- a/src/preview.cpp
+++ b/src/preview.cpp
@@ -1029,7 +1029,7 @@ namespace {
         const std::string header = "P6
" + toString(width) + " " + toString(height) + "
255
";
         const byte *headerBytes = reinterpret_cast<const byte*>(header.data());
 
-        DataBuf dest(header.size() + rgb.size_);
+        DataBuf dest(static_cast<long>(header.size() + rgb.size_));
         std::copy(headerBytes, headerBytes + header.size(), dest.pData_);
         std::copy(rgb.pData_, rgb.pData_ + rgb.size_, dest.pData_ + header.size());
         return dest;

-- 
exiv2 packaging