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

The following commit has been merged in the master branch:
commit 8377456786b4eef082f4bf501b60defb7f4a0bad
Author: Robin Mills <robin at clanmills.com>
Date:   Thu Aug 25 18:32:12 2016 +0000

    #922 Correction to r4344 to handle msvc build breaker.
---
 src/jpgimage.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/jpgimage.cpp b/src/jpgimage.cpp
index 8f852d6..e608ea8 100644
--- a/src/jpgimage.cpp
+++ b/src/jpgimage.cpp
@@ -769,12 +769,12 @@ namespace Exiv2 {
 #ifdef DEBUG
             std::cout << "iptc data blocks: " << iptcDataSegs.size() << std::endl;
             uint32_t toggle = 0 ;
-            for ( Uint32Vector_i it = iptcDataSegs.begin(); it != iptcDataSegs.end() ; it++ ) {
-                std::cout << *it ;
+            for ( Uint32Vector_i i = iptcDataSegs.begin(); i != iptcDataSegs.end() ; i++ ) {
+                std::cout << *i ;
                 if ( toggle++ % 2 ) std::cout << std::endl; else std::cout << ' ' ;
             }
 #endif
-            uint64_t count  = iptcDataSegs.size();
+            uint32_t count  = iptcDataSegs.size();
 
             // figure out which blocks to copy
             uint64_t* pos = new uint64_t[count+2];
@@ -782,7 +782,7 @@ namespace Exiv2 {
             // copy the data that is not iptc
             Uint32Vector_i it = iptcDataSegs.begin();
             for ( uint64_t  i = 0 ; i < count ; i++ ) {
-                bool  bOdd  = i%2;
+                bool  bOdd  = (i%2)!=0;
                 bool  bEven = !bOdd;
                 pos[i+1]    = bEven ? *it : pos[i] + *it;
                 it++;
@@ -804,7 +804,7 @@ namespace Exiv2 {
             for ( uint64_t i = 0 ; i < (count/2)+1 ; i++ ) {
                 uint64_t start  = pos[2*i]+2 ; // step JPG 2 byte marker
                 if ( start == 2 ) start = 0  ; // read the file 2 byte SOI
-                uint64_t length = pos[2*i+1] - start;
+                long length = (long) (pos[2*i+1] - start) ;
                 if ( length ) {
 #ifdef DEBUG
                     std::cout << start <<":"<< length << std::endl;

-- 
exiv2 packaging