[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=681acc7

The following commit has been merged in the master branch:
commit 681acc79013f9224afb7ba519689fea1f16fed09
Author: Robin Mills <robin at clanmills.com>
Date:   Tue Sep 27 19:21:45 2016 +0000

    #1199 and #1230 webpImage::printStructure().  Reporting Offset == 0 on Tiger (32bit).
---
 src/webpimage.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/webpimage.cpp b/src/webpimage.cpp
index 2887158..e356058 100644
--- a/src/webpimage.cpp
+++ b/src/webpimage.cpp
@@ -442,8 +442,8 @@ namespace Exiv2 {
             }
 
             io_->seek(0,BasicIo::beg); // rewind
+            uint64_t offset = (uint64_t) io_->tell();
             while ( !io_->eof() && (uint64_t) io_->tell() < filesize) {
-                uint64_t offset = (uint64_t) io_->tell();
                 byte     size_buff[WEBP_TAG_SIZE];
                 io_->read(chunkId.pData_, WEBP_TAG_SIZE);
                 io_->read(size_buff, WEBP_TAG_SIZE);
@@ -472,6 +472,7 @@ namespace Exiv2 {
                 }
 
                 if ( offset && io_->tell() % 2 ) io_->seek(+1, BasicIo::cur); // skip padding byte on sub-chunks
+                offset = io_->tell();
             }
         }
     }

-- 
exiv2 packaging