[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=9d8af01

The following commit has been merged in the master branch:
commit 9d8af01375380c8c3ee0f72bc0704be236390b6d
Author: HumanDynamo <caulier.gilles at gmail.com>
Date:   Sun Jul 27 20:10:10 2008 +0000

    wrong offset computation
---
 src/pngchunk.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pngchunk.cpp b/src/pngchunk.cpp
index a785612..a3768cc 100644
--- a/src/pngchunk.cpp
+++ b/src/pngchunk.cpp
@@ -170,7 +170,7 @@ namespace Exiv2
             std::string languageText((const char*)(data.pData_ + keysize + 3));
             unsigned int languageTextSize = languageText.size();
             // translated keyword string after the language description
-            std::string translatedKeyText((const char*)(data.pData_ + keysize + 3 + languageTextSize));
+            std::string translatedKeyText((const char*)(data.pData_ + keysize + 3 + languageTextSize +1));
             unsigned int translatedKeyTextSize = translatedKeyText.size();
 
             if ( compressionFlag[0] == 0x00 )
@@ -181,8 +181,8 @@ namespace Exiv2
 #endif
 
                 // the text comes after the translated keyword, but isn't null terminated
-                const byte* text = data.pData_ + keysize + 3 + languageTextSize + translatedKeyTextSize;
-                long textsize    = data.size_ - (keysize + 3 + languageTextSize + translatedKeyTextSize);
+                const byte* text = data.pData_ + keysize + 3 + languageTextSize + 1 + translatedKeyTextSize + 1;
+                long textsize    = data.size_ - (keysize + 3 + languageTextSize + 1 + translatedKeyTextSize + 1);
 
                 arr.alloc(textsize);
                 arr = DataBuf(text, textsize);

-- 
exiv2 packaging