[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=5f48c8e

The following commit has been merged in the master branch:
commit 5f48c8e9a67e1ab34220aecfc419fb6c6acf85b2
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sat Jun 10 14:34:58 2006 +0000

    Create a CommentValue rather than a DataValue for Exif.Photo.UserComment. Fixes Bug #471
---
 src/tiffvisitor.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/tiffvisitor.cpp b/src/tiffvisitor.cpp
index b61bca4..643a581 100644
--- a/src/tiffvisitor.cpp
+++ b/src/tiffvisitor.cpp
@@ -782,7 +782,16 @@ namespace Exiv2 {
                 // todo: adjust count_, make size_ a multiple of typeSize
             }
         }
-        Value::AutoPtr v = Value::create(object->typeId());
+        // On the fly type conversion for Exif.Photo.UserComment
+        // Todo: This should be somewhere else, maybe in a Value factory
+        // which takes a Key and Type
+        TypeId t = TypeId(object->typeId());
+        if (   object->tag()    == 0x9286 
+            && object->group()  == Group::exif 
+            && object->typeId() == undefined) {
+            t = comment;
+        }
+        Value::AutoPtr v = Value::create(t);
         if (v.get()) {
             v->read(object->pData(), object->size(), byteOrder());
             object->pValue_ = v.release();

-- 
exiv2 packaging