[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=2ff6495

The following commit has been merged in the master branch:
commit 2ff64957aa86662044c47dbb14f6dcbd70433998
Author: Robin Mills <robin at clanmills.com>
Date:   Thu Mar 31 14:27:43 2016 +0000

    #1175.  Thank You, LaserSoft, for reporting this and providing the patch.
---
 src/tiffvisitor.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/tiffvisitor.cpp b/src/tiffvisitor.cpp
index 815e169..e77552e 100644
--- a/src/tiffvisitor.cpp
+++ b/src/tiffvisitor.cpp
@@ -1344,7 +1344,7 @@ namespace Exiv2 {
             uint32_t maxi = 9;
             if (object->group() == ifd1Id) maxi = 1;
             for (uint32_t i = 0; i < object->count(); ++i) {
-                int32_t offset = getLong(object->pData() + 4*i, byteOrder());
+                uint32_t offset = getLong(object->pData() + 4*i, byteOrder());
                 if (   baseOffset() + offset > size_
                     || static_cast<int32_t>(baseOffset()) + offset < 0) {
 #ifndef SUPPRESS_WARNINGS
@@ -1491,7 +1491,7 @@ namespace Exiv2 {
         p += 4;
         uint32_t isize= 0; // size of Exif.Sony1.PreviewImage
         uint32_t size = typeSize * count;
-        int32_t offset = getLong(p, byteOrder());
+        uint32_t offset = getLong(p, byteOrder());
         byte* pData = p;
         if (   size > 4
             && (   baseOffset() + offset >= size_

-- 
exiv2 packaging