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

The following commit has been merged in the master branch:
commit a1a5ff02b8665c411456a53236bd526ea4051700
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Fri Feb 3 04:41:44 2006 +0000

    Fixed invalid type id for user comment tag, bug #451
---
 src/Todo     | 1 -
 src/exif.cpp | 7 ++++++-
 src/ifd.cpp  | 9 ---------
 src/ifd.hpp  | 2 +-
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/Todo b/src/Todo
index 745dd06..6c6c7a9 100644
--- a/src/Todo
+++ b/src/Todo
@@ -36,5 +36,4 @@ Bugs:
   if the metadata is not compatible
 + Review: Exception safety
 + Review: Ifd1 only at Thumbnail, do we really need Thumbnail::update() ?
-+ Is the hexdump output of exiv2 byte-swapped??
 + Should JpegImage differ between NO Jpeg comment and an empty Jpeg comment??
diff --git a/src/exif.cpp b/src/exif.cpp
index d75685a..4ae03f4 100644
--- a/src/exif.cpp
+++ b/src/exif.cpp
@@ -184,7 +184,12 @@ namespace Exiv2 {
 
     void Exifdatum::setValue(const Entry& e, ByteOrder byteOrder)
     {
-        value_ = Value::create(TypeId(e.type()));
+        TypeId t = TypeId(e.type());
+        // Hack: On the fly type conversion for Exif.Photo.UserComment 
+        if (e.tag() == 0x9286 && e.ifdId() == exifIfdId && e.type() == undefined) {
+            t = comment;
+        }
+        value_ = Value::create(t);
         value_->read(e.data(), e.count() * e.typeSize(), byteOrder);
         value_->setDataArea(e.dataArea(), e.sizeDataArea());
     }
diff --git a/src/ifd.cpp b/src/ifd.cpp
index 500d661..ccedce0 100644
--- a/src/ifd.cpp
+++ b/src/ifd.cpp
@@ -119,15 +119,6 @@ namespace Exiv2 {
         return *this;
     } // Entry::operator=
 
-    uint16_t Entry::type() const 
-    {
-        // Hack: On the fly type conversion for Exif.Photo.UserComment 
-        if (tag_ == 0x9286 && ifdId_ == exifIfdId && type_ == undefined) {
-            return comment;
-        }
-        return type_; 
-    }
-
     void Entry::setValue(uint32_t data, ByteOrder byteOrder)
     {
         if (pData_ == 0 || size_ < 4) {
diff --git a/src/ifd.hpp b/src/ifd.hpp
index 7cf7aeb..25b289e 100644
--- a/src/ifd.hpp
+++ b/src/ifd.hpp
@@ -182,7 +182,7 @@ namespace Exiv2 {
         //! Return the tag
         uint16_t tag() const { return tag_; }
         //! Return the type id.
-        uint16_t type() const;
+        uint16_t type() const { return type_; }
         //! Return the name of the type
         const char* typeName() const
             { return TypeInfo::typeName(TypeId(type_)); }

-- 
exiv2 packaging