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

The following commit has been merged in the master branch:
commit cbdba2bb1298b800737e60f6223844443b53e0e2
Author: Robin Mills <robin at clanmills.com>
Date:   Thu Jun 9 11:40:33 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 a93e142..275cbf0 100644
--- a/src/tiffimage.cpp
+++ b/src/tiffimage.cpp
@@ -593,7 +593,7 @@ namespace Exiv2 {
                         io.read(bytes,jump    )     ;  // read
                         bytes[jump]=0               ;
                         if ( ::strcmp("Nikon",chars) == 0 ) {
-                            printTiffStructure(io,out,option,depth,offset+jump);
+                            printTiffStructure(io,out,option,depth,(size_t)offset+jump);
                         }
                         io.seek(restore,BasicIo::beg); // restore
                     }
@@ -633,7 +633,7 @@ namespace Exiv2 {
                         || ( c == 'I' && isBigEndian()    )
                         ;
 
-            uint32_t start = byteSwap4(dir,4,bSwap)+offset;
+            uint32_t start = byteSwap4(dir,4,bSwap)+(uint32_t)offset;
             printIFDStructure(io,out,option,start,bSwap,c,depth);
         }
     }

-- 
exiv2 packaging