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

The following commit has been merged in the master branch:
commit 9f0b41c57d667fd893c6da1065d098fffe4d701d
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sat Feb 16 07:26:47 2008 +0000

    Fixed XmpKey::tagLabel() for custom keys (bug reported by Vladimir Nadvornik)
---
 src/properties.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/properties.cpp b/src/properties.cpp
index 6c03807..078b29a 100644
--- a/src/properties.cpp
+++ b/src/properties.cpp
@@ -915,7 +915,9 @@ namespace Exiv2 {
 
     std::string XmpKey::tagLabel() const
     {
-        return XmpProperties::propertyTitle(*this);
+        const char* pt = XmpProperties::propertyTitle(*this);
+        if (!pt) return tagName();
+        return pt;
     }
 
     std::string XmpKey::ns() const

-- 
exiv2 packaging