[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=104eb6b

The following commit has been merged in the master branch:
commit 104eb6b7fe71c34c7f59acee96b4327fd929da31
Author: Robin Mills <robin at clanmills.com>
Date:   Sat Aug 13 21:26:16 2016 +0000

    #1199 Fixing MSVC build breaker involving long/uint64_t conflict.  Minor changes to behaviour of Internal::binaryToHex()
---
 src/image.cpp     | 16 +++++++---------
 src/webpimage.cpp | 29 +++++++++++++++--------------
 2 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/src/image.cpp b/src/image.cpp
index 2d87ce8..3c08a4f 100644
--- a/src/image.cpp
+++ b/src/image.cpp
@@ -655,8 +655,6 @@ namespace Exiv2 {
         unsigned long tl = (unsigned long)((size / 16) * 16);
         unsigned long tl_offset = (unsigned long)(size - tl);
 
-        hexOutput << "Display Hex Dump [size:" << (unsigned long)size << "]" << std::endl;
-
         for (unsigned long loop = 0; loop < (unsigned long)size; loop++) {
             if (data[loop] < 16) {
                 hexOutput << "0";
@@ -685,7 +683,7 @@ namespace Exiv2 {
                     if (data[loop - offset] >= 0x20 && data[loop - offset] <= 0x7E) {
                         c = data[loop - offset] ;
                     }
-                    hexOutput << c ;
+                    hexOutput << (char) c ;
                 }
                 hexOutput << std::endl;
             }
@@ -696,13 +694,13 @@ namespace Exiv2 {
         return hexOutput.str();
     }
 
-	std::string indent(int32_t d)
+    std::string indent(int32_t d)
     {
-    	std::string result ;
-    	if ( d > 0 )
-    		while ( d--)
-    			result += "  ";
-    	return result;
+        std::string result ;
+        if ( d > 0 )
+            while ( d--)
+                result += "  ";
+        return result;
     }
 
 }}                                      // namespace Internal, Exiv2
diff --git a/src/webpimage.cpp b/src/webpimage.cpp
index c99f017..2b0a3b8 100644
--- a/src/webpimage.cpp
+++ b/src/webpimage.cpp
@@ -166,7 +166,7 @@ namespace Exiv2 {
             while (!io_->eof()) {
                 io_->read(chunkId.pData_, 4);
                 io_->read(size_buff, 4);
-                uint64_t size = Exiv2::getULong(size_buff, littleEndian);
+                long size = Exiv2::getULong(size_buff, littleEndian);
                 DataBuf payload(size);
                 io_->read(payload.pData_, payload.size_);
 
@@ -293,7 +293,7 @@ namespace Exiv2 {
             io_->read(chunkId.pData_, 4);
             io_->read(size_buff, 4);
 
-            uint64_t size = Exiv2::getULong(size_buff, littleEndian);
+            long size = Exiv2::getULong(size_buff, littleEndian);
 
             DataBuf payload(size);
             io_->read(payload.pData_, size);
@@ -344,7 +344,7 @@ namespace Exiv2 {
             // Check for extra 

-- 
exiv2 packaging