[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=6a1b7d2

The following commit has been merged in the master branch:
commit 6a1b7d262f42acc548e189f048ea85849f5ab704
Author: Robin Mills <robin at clanmills.com>
Date:   Fri Oct 21 17:35:03 2016 +0000

    #1243 Correction to msvc build breaker in r4648
---
 src/jp2image.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/jp2image.cpp b/src/jp2image.cpp
index 0bfce1c..f7eaaec 100644
--- a/src/jp2image.cpp
+++ b/src/jp2image.cpp
@@ -606,7 +606,7 @@ namespace Exiv2
 
         Jp2BoxHeader* pBox   = (Jp2BoxHeader*) boxBuf.pData_;
         int32_t       length = getLong((byte*)&pBox->length, bigEndian);
-        uint32_t      count  = sizeof (Jp2BoxHeader);
+        int32_t       count  = sizeof (Jp2BoxHeader);
         char*         p      = (char*) boxBuf.pData_;
         bool          bWroteColor = false ;
 
@@ -635,16 +635,16 @@ namespace Exiv2
             if ( newBox.type == kJp2BoxTypeColorHeader ) {
                 bWroteColor = true ;
                 if ( ! iccProfileDefined() ) {
-                    const char* pad = "\x01\x00\x00\x00\x00\x00\x10\x00\x00\x05\x1cuuid";
-                    size_t     psize = 15;
+                    const char* pad   = "\x01\x00\x00\x00\x00\x00\x10\x00\x00\x05\x1cuuid";
+                    uint32_t    psize = 15;
                     ul2Data((byte*)&newBox.length,psize      ,bigEndian);
                     ul2Data((byte*)&newBox.type  ,newBox.type,bigEndian);
                     ::memcpy(output.pData_+outlen                     ,&newBox            ,sizeof(newBox));
                     ::memcpy(output.pData_+outlen+sizeof(newBox)      ,pad                ,psize         );
                     newlen = psize ;
                 } else {
-                    const char* pad  = "

-- 
exiv2 packaging