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

The following commit has been merged in the master branch:
commit 7e285c650d54411881e424b19733c27ac768586d
Author: Robin Mills <robin at clanmills.com>
Date:   Thu Jun 9 18:48:09 2016 +0000

    More corrections to r4316 for msvc build breakers
---
 src/tiffimage.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/tiffimage.cpp b/src/tiffimage.cpp
index 275cbf0..1308839 100644
--- a/src/tiffimage.cpp
+++ b/src/tiffimage.cpp
@@ -585,7 +585,7 @@ namespace Exiv2 {
                         IptcData::printStructure(out,bytes,count,depth);
                         delete[] bytes;                // free
                     }  else if ( option == kpsRecursive && tag == 0x927c /* MakerNote */ && count > 10) {
-                        size_t   jump= 10           ;
+                        uint32_t jump= 10           ;
                         byte     bytes[20]          ;
                         const char* chars = (const char*) &bytes[0] ;
                         size_t   restore = io.tell();  // save
@@ -593,7 +593,7 @@ namespace Exiv2 {
                         io.read(bytes,jump    )     ;  // read
                         bytes[jump]=0               ;
                         if ( ::strcmp("Nikon",chars) == 0 ) {
-                            printTiffStructure(io,out,option,depth,(size_t)offset+jump);
+                            printTiffStructure(io,out,option,depth,(size_t)(offset+jump));
                         }
                         io.seek(restore,BasicIo::beg); // restore
                     }

-- 
exiv2 packaging