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

The following commit has been merged in the master branch:
commit fe4f6f07f11cc13b3415f316edda1deea8a7a1d7
Author: draekko <draekko.software at gmail.com>
Date:   Sat Aug 13 20:37:24 2016 +0000

    #1199 update to binaryToHex, should remove compile warnings and fix extra space padding.
---
 src/image.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/image.cpp b/src/image.cpp
index e09f4c8..2d87ce8 100644
--- a/src/image.cpp
+++ b/src/image.cpp
@@ -652,8 +652,8 @@ namespace Exiv2 {
     {
         std::stringstream hexOutput;
 
-        unsigned long tl = (unsigned long)(size / 16) * 16;
-        unsigned long tl_offset = size - tl;
+        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;
 
@@ -669,7 +669,6 @@ namespace Exiv2 {
                 int max = 15;
                 if (loop >= tl) {
                     max = tl_offset - 1;
-                    hexOutput << "  ";
                     for (int offset = 0; offset < (int)(16 - tl_offset); offset++) {
                         if ((offset % 8) == 7) {
                             hexOutput << "  ";

-- 
exiv2 packaging