[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=44da472

The following commit has been merged in the master branch:
commit 44da4724b38935c672dd683484b4a575b600d1d4
Author: Robin Mills <robin at clanmills.com>
Date:   Sun Apr 23 10:58:54 2017 +0000

    #1175 Correction to r4756 Another three casts required to build with Visual Studio (size_t code ripple)
---
 src/jp2image.cpp | 2 +-
 src/preview.cpp  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/jp2image.cpp b/src/jp2image.cpp
index c857f1a..1892fd4 100644
--- a/src/jp2image.cpp
+++ b/src/jp2image.cpp
@@ -706,7 +706,7 @@ namespace Exiv2
         // FIXME: Andreas, why the loop do not stop when EOF is taken from _io. The loop go out by an exception
         // generated by a zero size data read.
 
-        while(io_->tell() < io_->size())
+        while(io_->tell() < (long) io_->size())
         {
 #ifdef DEBUG
             std::cout << "Exiv2::Jp2Image::doWriteMetadata: Position: " << io_->tell() << " / " << io_->size() << std::endl;
diff --git a/src/preview.cpp b/src/preview.cpp
index 6e1722e..c34c8bd 100644
--- a/src/preview.cpp
+++ b/src/preview.cpp
@@ -471,7 +471,7 @@ namespace {
         }
         IoCloser closer(io);
         const byte* data = io.mmap();
-        if (io.size() < nativePreview_.position_ + static_cast<long>(nativePreview_.size_)) {
+        if ((long)io.size() < nativePreview_.position_ + static_cast<long>(nativePreview_.size_)) {
 #ifndef SUPPRESS_WARNINGS
             EXV_WARNING << "Invalid native preview position or size.
";
 #endif

-- 
exiv2 packaging