[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=58f2d61

The following commit has been merged in the master branch:
commit 58f2d61ecd46d13911b60ec4fef78a298c64bbdc
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Mon Nov 14 16:23:18 2011 +0000

    #795: Fixed decoding of PNG comment.
---
 src/pngchunk.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/pngchunk.cpp b/src/pngchunk.cpp
index 929b974..a7cad3a 100644
--- a/src/pngchunk.cpp
+++ b/src/pngchunk.cpp
@@ -95,13 +95,13 @@ namespace Exiv2 {
 
 #ifdef DEBUG
         std::cout << "Exiv2::PngChunk::decodeTXTChunk: TXT chunk key: "
-                  << std::string((const char*)key.pData_) << "
";
+                  << std::string((const char*)key.pData_, key.size_) << "
";
 #endif
         DataBuf arr = parseTXTChunk(data, key.size_, type);
 
 #ifdef DEBUG
         std::cout << "Exiv2::PngChunk::decodeTXTChunk: TXT chunk data: "
-                  << std::string((const char*)arr.pData_, 32) << "
";
+                  << std::string((const char*)arr.pData_, arr.size_) << "
";
 #endif
         parseChunkContent(pImage, key.pData_, key.size_, arr);
 
@@ -449,7 +449,8 @@ namespace Exiv2 {
                                     compressedText,
                                     compressedTextSize);
             if (zlibResult == Z_OK) {
-                arr.alloc(uncompressedLen);
+                assert((uLongf)arr.size_ >= uncompressedLen);
+                arr.size_ = uncompressedLen;
             }
             else if (zlibResult == Z_BUF_ERROR) {
                 // the uncompressedArray needs to be larger

-- 
exiv2 packaging