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

The following commit has been merged in the master branch:
commit 77510684a331116ecf8fe5a5a16ab12a568b7f44
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sat Sep 17 08:22:57 2011 +0000

    Added explicit casts; fixes MSVC 64bit compilation.
---
 src/convert.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/convert.cpp b/src/convert.cpp
index ce3e8fe..85e1665 100644
--- a/src/convert.cpp
+++ b/src/convert.cpp
@@ -1372,7 +1372,7 @@ namespace {
     bool mb2wc(UINT cp, std::string& str)
     {
         if (str.empty()) return true;
-        int len = MultiByteToWideChar(cp, 0, str.c_str(), str.size(), 0, 0);
+        int len = MultiByteToWideChar(cp, 0, str.c_str(), (int)str.size(), 0, 0);
         if (len == 0) {
 #ifdef DEBUG
             EXV_DEBUG << "mb2wc: Failed to determine required size of output buffer.
";
@@ -1381,7 +1381,7 @@ namespace {
         }
         std::vector<std::string::value_type> out;
         out.resize(len * 2);
-        int ret = MultiByteToWideChar(cp, 0, str.c_str(), str.size(), (LPWSTR)&out[0], len * 2);
+        int ret = MultiByteToWideChar(cp, 0, str.c_str(), (int)str.size(), (LPWSTR)&out[0], len * 2);
         if (ret == 0) {
 #ifdef DEBUG
             EXV_DEBUG << "mb2wc: Failed to convert the input string to a wide character string.
";
@@ -1401,7 +1401,7 @@ namespace {
 #endif
             return false;
         }
-        int len = WideCharToMultiByte(cp, 0, (LPCWSTR)str.data(), str.size() / 2, 0, 0, 0, 0);
+        int len = WideCharToMultiByte(cp, 0, (LPCWSTR)str.data(), (int)str.size() / 2, 0, 0, 0, 0);
         if (len == 0) {
 #ifdef DEBUG
             EXV_DEBUG << "wc2mb: Failed to determine required size of output buffer.
";
@@ -1410,7 +1410,7 @@ namespace {
         }
         std::vector<std::string::value_type> out;
         out.resize(len);
-        int ret = WideCharToMultiByte(cp, 0, (LPCWSTR)str.data(), str.size() / 2, (LPSTR)&out[0], len, 0, 0);
+        int ret = WideCharToMultiByte(cp, 0, (LPCWSTR)str.data(), (int)str.size() / 2, (LPSTR)&out[0], len, 0, 0);
         if (ret == 0) {
 #ifdef DEBUG
             EXV_DEBUG << "wc2mb: Failed to convert the input string to a multi byte string.
";

-- 
exiv2 packaging