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

The following commit has been merged in the master branch:
commit b09c2049a60bbd22c796a4abeb0e864ddd221b49
Author: Robin Mills <robin at clanmills.com>
Date:   Sat Aug 13 13:28:59 2016 +0000

    #1199 Fixing build breaker introduced by r4369
---
 src/image.cpp | 64 ++++++-----------------------------------------------------
 1 file changed, 6 insertions(+), 58 deletions(-)

diff --git a/src/image.cpp b/src/image.cpp
index 6e2933f..e09f4c8 100644
--- a/src/image.cpp
+++ b/src/image.cpp
@@ -670,7 +670,7 @@ namespace Exiv2 {
                 if (loop >= tl) {
                     max = tl_offset - 1;
                     hexOutput << "  ";
-                    for (long offset = 0; offset < (16 - tl_offset); offset++) {
+                    for (int offset = 0; offset < (int)(16 - tl_offset); offset++) {
                         if ((offset % 8) == 7) {
                             hexOutput << "  ";
                         }
@@ -678,67 +678,15 @@ namespace Exiv2 {
                     }
                 }
                 hexOutput << " ";
-                for (unsigned long  offset = max; offset >= 0; offset--) {
+                for (int  offset = max; offset >= 0; offset--) {
                     if (offset == (max - 8)) {
                         hexOutput << "  ";
                     }
-                    if ((data[loop - offset]) >= 0x20 &&
-                        (data[loop - offset]) <= 0x7E) {
-                        hexOutput << data[loop - offset];
-                    } else {
-                        hexOutput << ".";
-                    }
-                }
-                hexOutput << std::endl;
-            }
-        }
-
-        hexOutput << std::endl << std::endl << std::endl;
-
-        return hexOutput.str();
-    }
-
-    std::string binaryToHex(const byte *data, size_t size)
-    {
-        std::stringstream hexOutput;
-
-        unsigned long tl = (unsigned long)(size / 16) * 16;
-        unsigned long tl_offset = 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";
-            }
-            hexOutput << std::hex << (int)data[loop];
-            if ((loop % 8) == 7) {
-                hexOutput << "  ";
-            }
-            if ((loop % 16) == 15 || loop == (tl + tl_offset - 1)) {
-                int max = 15;
-                if (loop >= tl) {
-                    max = tl_offset - 1;
-                    hexOutput << "  ";
-                    for (unsigned long offset = 0; offset < (unsigned long)(16 - tl_offset); offset++) {
-                        if ((offset % 8) == 7) {
-                            hexOutput << "  ";
-                        }
-                        hexOutput << "   ";
-                    }
-                }
-                hexOutput << " ";
-                unsigned long cutoff = 0;
-                for (unsigned long offset = max; offset >= cutoff; offset--) {
-                    if (offset == (unsigned long)(max - 8)) {
-                        hexOutput << "  ";
-                    }
-                    if ((data[loop - offset]) >= 0x20 &&
-                        (data[loop - offset]) <= 0x7E) {
-                        hexOutput << data[loop - offset];
-                    } else {
-                        hexOutput << ".";
+                    byte c = '.';
+                    if (data[loop - offset] >= 0x20 && data[loop - offset] <= 0x7E) {
+                        c = data[loop - offset] ;
                     }
+                    hexOutput << c ;
                 }
                 hexOutput << std::endl;
             }

-- 
exiv2 packaging