[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=8f5e5a8

The following commit has been merged in the master branch:
commit 8f5e5a8c4ad3dace3a769fd963c06d51c6e9e662
Author: tbeu <mail at tbeu.de>
Date:   Fri Apr 10 18:50:03 2015 +0000

    refs #922:
    
     * Fix MSVC warning introduced by r3650
     * Change first argument of BasicIo::seek to signed integer type
---
 include/exiv2/basicio.hpp | 8 ++++----
 src/basicio.cpp           | 6 +++---
 src/pngimage.cpp          | 6 +++++-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/include/exiv2/basicio.hpp b/include/exiv2/basicio.hpp
index 64d214e..ea01fc3 100644
--- a/include/exiv2/basicio.hpp
+++ b/include/exiv2/basicio.hpp
@@ -179,7 +179,7 @@ namespace Exiv2 {
               Nonzero if failure;
          */
 #if defined(_MSC_VER)
-        virtual int seek(uint64_t offset, Position pos) = 0;
+        virtual int seek(int64_t offset, Position pos) = 0;
 #else
         virtual int seek(long offset, Position pos) = 0;
 #endif
@@ -448,7 +448,7 @@ namespace Exiv2 {
                  Nonzero if failure;
          */
 #if defined(_MSC_VER)
-        virtual int seek(uint64_t offset, Position pos);
+        virtual int seek(int64_t offset, Position pos);
 #else
         virtual int seek(long offset, Position pos);
 #endif
@@ -680,7 +680,7 @@ namespace Exiv2 {
                  Nonzero if failure;
          */
 #if defined(_MSC_VER)
-        virtual int seek(uint64_t offset, Position pos);
+        virtual int seek(int64_t offset, Position pos);
 #else
         virtual int seek(long offset, Position pos);
 #endif
@@ -1026,7 +1026,7 @@ namespace Exiv2 {
                 Nonzero if failure;
         */
 #if defined(_MSC_VER)
-       virtual int seek(uint64_t offset, Position pos);
+       virtual int seek(int64_t offset, Position pos);
 #else
        virtual int seek(long offset, Position pos);
 #endif
diff --git a/src/basicio.cpp b/src/basicio.cpp
index d87477d..ca99e13 100644
--- a/src/basicio.cpp
+++ b/src/basicio.cpp
@@ -933,7 +933,7 @@ namespace Exiv2 {
     }
 
 #if defined(_MSC_VER)
-    int FileIo::seek( uint64_t offset, Position pos )
+    int FileIo::seek( int64_t offset, Position pos )
     {
         assert(p_->fp_ != 0);
 
@@ -1249,7 +1249,7 @@ namespace Exiv2 {
     }
 
 #if defined(_MSC_VER)
-    int MemIo::seek( uint64_t offset, Position pos )
+    int MemIo::seek( int64_t offset, Position pos )
     {
         uint64_t newIdx = 0;
 
@@ -1853,7 +1853,7 @@ namespace Exiv2 {
     }
 
 #if defined(_MSC_VER)
-    int RemoteIo::seek( uint64_t offset, Position pos )
+    int RemoteIo::seek( int64_t offset, Position pos )
     {
         assert(p_->isMalloced_);
         uint64_t newIdx = 0;
diff --git a/src/pngimage.cpp b/src/pngimage.cpp
index 5c05f86..a1c424d 100644
--- a/src/pngimage.cpp
+++ b/src/pngimage.cpp
@@ -157,7 +157,11 @@ namespace Exiv2 {
                 int       start = ::strlen(key);
                 buff[start] = 0;
                 if ( option == kpsXMP && ::strcmp((const char*)buff,key) == 0 ) {
-                    io_->seek(-blen , BasicIo::cur);
+#if defined(_MSC_VER)
+                    io_->seek(-static_cast<int64_t>(blen) , BasicIo::cur);
+#else
+                    io_->seek(-static_cast<long>(blen) , BasicIo::cur);
+#endif
                     dataOffset = dOff ;
                     byte* xmp  = new byte[dataOffset+5];
                     io_->read(xmp,dataOffset+4);

-- 
exiv2 packaging