[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=52f8c36

The following commit has been merged in the master branch:
commit 52f8c366c2aebf4669ddab97225b20f9c4747218
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Tue Jan 12 14:06:54 2010 +0000

    #662: Patch exiv2-exifcomment-unicode.patch from Leo Sutic (unmodified, without exiv2-bug662.jpg).
---
 src/convert.cpp                   |   5 +-
 src/exiv2.cpp                     |  89 ++++++++++++++++++++++++++++++-
 src/value.cpp                     | 107 ++++++++++++++++++++++++++++++++------
 src/value.hpp                     |  16 ++++++
 test/Makefile                     |   1 +
 test/exifcomment-encoding-test.sh |  37 +++++++++++++
 6 files changed, 235 insertions(+), 20 deletions(-)

diff --git a/src/convert.cpp b/src/convert.cpp
index f4b8d8e..642d113 100644
--- a/src/convert.cpp
+++ b/src/convert.cpp
@@ -1325,7 +1325,7 @@ 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,6 +1335,7 @@ namespace Exiv2 {
                               &inbytesleft,
                               &outptr,
                               &outbytesleft);
+            outbytesProduced += sizeof(outbuf) - 1 - outbytesleft;
             if (rc == size_t(-1) && errno != E2BIG) {
 #ifndef SUPPRESS_WARNINGS
                 std::cerr << "Warning: iconv: "
@@ -1345,7 +1346,7 @@ namespace Exiv2 {
                 break;
             }
             *outptr = '

-- 
exiv2 packaging