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

The following commit has been merged in the master branch:
commit e43a11f7b23e8008be0b6115f5aa1e9478d07ea4
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Tue Jan 19 14:04:09 2010 +0000

    #662: Code tweak and updated expected test results.
---
 src/value.cpp               |   8 ++------
 test/data/bugfixes-test.out | Bin 64491 -> 64491 bytes
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/value.cpp b/src/value.cpp
index d36ae8a..b8a4f9f 100644
--- a/src/value.cpp
+++ b/src/value.cpp
@@ -476,12 +476,8 @@ namespace Exiv2 {
             if (pos != std::string::npos) c = comment.substr(pos+1);
         }
         if (charsetId == unicode) {
-            if (byteOrder_ == littleEndian) {
-                convertStringCharset(c, "UTF-8", "UCS-2LE");
-            }
-            else {
-                convertStringCharset(c, "UTF-8", "UCS-2BE");
-            }
+            const char* to = byteOrder_ == littleEndian ? "UCS-2LE" : "UCS-2BE";
+            convertStringCharset(c, "UTF-8", to);
         }
         const std::string code(CharsetInfo::code(charsetId), 8);
         return StringValueBase::read(code + c);
diff --git a/test/data/bugfixes-test.out b/test/data/bugfixes-test.out
index 02efcdf..a8ca1a4 100644
Binary files a/test/data/bugfixes-test.out and b/test/data/bugfixes-test.out differ

-- 
exiv2 packaging