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

The following commit has been merged in the master branch:
commit b9f584fbbf72acbbbade5ff4710ecc2ea69b8699
Author: Robin Mills <robin at clanmills.com>
Date:   Tue Oct 18 10:11:39 2016 +0000

    #1430 Correcting MSVC build breaker in r4639
---
 src/basicio.cpp  | 13 +++++++------
 src/crwimage.cpp |  2 +-
 src/jp2image.cpp |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/basicio.cpp b/src/basicio.cpp
index dfd1e88..f3f7970 100644
--- a/src/basicio.cpp
+++ b/src/basicio.cpp
@@ -1907,22 +1907,23 @@ namespace Exiv2 {
 
     byte* RemoteIo::mmap(bool /*isWriteable*/)
     {
-        long nRealData = 0 ;
+        size_t nRealData = 0 ;
         if ( !bigBlock_ ) {
-            int blockSize = p_->blockSize_;
-            int blocks = (p_->size_ + blockSize -1)/blockSize ;
+            size_t blockSize = p_->blockSize_;
+            size_t blocks = (p_->size_ + blockSize -1)/blockSize ;
             bigBlock_   = new byte[blocks*blockSize] ;
-            for ( int block = 0 ; block < blocks ; block ++ ) {
+            for ( size_t block = 0 ; block < blocks ; block ++ ) {
                 void* p = p_->blocksMap_[block].getData();
                 if  ( p ) {
                     nRealData += blockSize ;
                     memcpy(bigBlock_+(block*blockSize),p,blockSize);
                 }
             }
-        }
 #ifdef DEBUG
-        std::cerr << "RemoteIo::mmap nRealData = " << nRealData << std::endl;
+            std::cerr << "RemoteIo::mmap nRealData = " << nRealData << std::endl;
 #endif
+		}
+
         return bigBlock_;
     }
 
diff --git a/src/crwimage.cpp b/src/crwimage.cpp
index 883948c..dfee119 100644
--- a/src/crwimage.cpp
+++ b/src/crwimage.cpp
@@ -136,7 +136,7 @@ namespace Exiv2 {
         try {
             std::ofstream devnull;
             printStructure(devnull,kpsRecursive,0);
-        } catch (Exiv2::Error& e) {
+        } catch (Exiv2::Error& /* e */) {
             DataBuf file(io().size());
             io_->read(file.pData_,file.size_);
         }
diff --git a/src/jp2image.cpp b/src/jp2image.cpp
index 385d49f..5a7d2ca 100644
--- a/src/jp2image.cpp
+++ b/src/jp2image.cpp
@@ -486,7 +486,7 @@ namespace Exiv2
                         lf(out,bLF);
 
                         while (io_->read((byte*)&subBox, sizeof(subBox)) == sizeof(subBox)
-                               && io_->tell() < position + box.length) // don't read beyond the box!
+                               && io_->tell() < position + (long) box.length) // don't read beyond the box!
                         {
                             subBox.length = getLong((byte*)&subBox.length, bigEndian);
                             subBox.type   = getLong((byte*)&subBox.type, bigEndian);

-- 
exiv2 packaging