[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=942d217

The following commit has been merged in the master branch:
commit 942d217e89c34c40f2930dff984ffdcc4d993a9f
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Thu Jan 14 02:26:15 2010 +0000

    #662: Fixes by Leo Sutic. Added carriage return to the special characters.
---
 src/actions.cpp             |   6 ++---
 src/convert.cpp             |   3 +--
 src/exiv2.cpp               |  19 ++++++--------
 src/tags.cpp                |  15 +++++------
 test/conversions.sh         |   2 +-
 test/data/bugfixes-test.out | Bin 64491 -> 64491 bytes
 test/data/conversions.out   |  24 +++++++++---------
 test/data/exiv2-test.out    |  60 ++++++++++++++++++++++----------------------
 8 files changed, 60 insertions(+), 69 deletions(-)

diff --git a/src/actions.cpp b/src/actions.cpp
index 3083d1a..741a20d 100644
--- a/src/actions.cpp
+++ b/src/actions.cpp
@@ -625,7 +625,7 @@ namespace Action {
                 && (   md.typeId() == Exiv2::undefined
                     || md.typeId() == Exiv2::unsignedByte
                     || md.typeId() == Exiv2::signedByte)
-                && md.size() > 100) {
+                && md.size() > 128) {
                 std::cout << _("(Binary value suppressed)") << std::endl;
                 return;
             }
@@ -638,7 +638,7 @@ namespace Action {
                 && (   md.typeId() == Exiv2::undefined
                     || md.typeId() == Exiv2::unsignedByte
                     || md.typeId() == Exiv2::signedByte)
-                && md.size() > 100) {
+                && md.size() > 128) {
                 std::cout << _("(Binary value suppressed)") << std::endl;
                 return;
             }
@@ -651,7 +651,7 @@ namespace Action {
                 && (   md.typeId() == Exiv2::undefined
                     || md.typeId() == Exiv2::unsignedByte
                     || md.typeId() == Exiv2::signedByte)
-                && md.size() > 100) {
+                && md.size() > 128) {
                 std::cout << _("(Binary value suppressed)") << std::endl;
                 return;
             }
diff --git a/src/convert.cpp b/src/convert.cpp
index 642d113..4bde10b 100644
--- a/src/convert.cpp
+++ b/src/convert.cpp
@@ -1325,7 +1325,6 @@ namespace Exiv2 {
         std::string outstr;
         EXV_ICONV_CONST char *inptr = const_cast<char *>(str.c_str());
         size_t inbytesleft = str.length();
-        int outbytesProduced = 0;
         while (inbytesleft) {
             char outbuf[100];
             char *outptr = outbuf;
@@ -1335,7 +1334,7 @@ namespace Exiv2 {
                               &inbytesleft,
                               &outptr,
                               &outbytesleft);
-            outbytesProduced += sizeof(outbuf) - 1 - outbytesleft;
+            int outbytesProduced = sizeof(outbuf) - 1 - outbytesleft;
             if (rc == size_t(-1) && errno != E2BIG) {
 #ifndef SUPPRESS_WARNINGS
                 std::cerr << "Warning: iconv: "
diff --git a/src/exiv2.cpp b/src/exiv2.cpp
index b766a12..1accca0 100644
--- a/src/exiv2.cpp
+++ b/src/exiv2.cpp
@@ -1131,23 +1131,19 @@ namespace {
             ++i;
             ch = input[i];
             switch (ch) {
-            // Escaping of backslash
-            case '\':
+            case '\':                          // Escaping of backslash
                 result.push_back('\');
                 break;
-
-            // Escaping of newline
-            case 'n':
+            case 'r':                           // Escaping of carriage return
+                result.push_back('
');
+                break;
+            case 'n':                           // Escaping of newline
                 result.push_back('
');
                 break;
-
-            // Escaping of tab
-            case 't':
+            case 't':                           // Escaping of tab
                 result.push_back('	');
                 break;
-                    
-            // Escaping of unicode
-            case 'u':
+            case 'u':                           // Escaping of unicode
                 if (input.length() - 4 > i) {
                     int acc = 0;
                     for (int j = 0; j < 4; ++j) {
@@ -1186,7 +1182,6 @@ namespace {
                     result.push_back(ch);
                 }
                 break;
-
             default:
                 result.push_back('\');
                 result.push_back(ch);
diff --git a/src/tags.cpp b/src/tags.cpp
index c055797..318f09c 100644
--- a/src/tags.cpp
+++ b/src/tags.cpp
@@ -2515,17 +2515,14 @@ namespace Exiv2 {
         return os;
     }
 
-    // Todo: Implement this properly
     std::ostream& print0x9286(std::ostream& os, const Value& value, const ExifData*)
     {
-        if (value.size() > 8) {
-            DataBuf buf(value.size());
-            value.copy(buf.pData_, bigEndian);
-            // Hack: Skip the leading 8-Byte character code, truncate
-            // trailing '

-- 
exiv2 packaging