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

The following commit has been merged in the master branch:
commit d1a305e30f354bed10ffffebe349ebbeea6093ff
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Thu May 1 08:22:26 2008 +0000

    Added LangAltValue::toString(const std::string&) to get the value for a specific language qualifier (suggested by Marco Piovanelli).
---
 src/value.cpp | 10 ++++++++++
 src/value.hpp | 14 +++++++++++---
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/value.cpp b/src/value.cpp
index 96ef9b7..9e40c3a 100644
--- a/src/value.cpp
+++ b/src/value.cpp
@@ -702,6 +702,16 @@ namespace Exiv2 {
 
     std::string LangAltValue::toString(long /*n*/) const 
     {
+        return toString("x-default");
+    }
+
+    std::string LangAltValue::toString(const std::string& qualifier) const 
+    {
+        ValueType::const_iterator i = value_.find(qualifier);
+        if (i != value_.end()) {
+            ok_ = true;
+            return i->second;
+        }
         ok_ = false;
         return "";
     }
diff --git a/src/value.hpp b/src/value.hpp
index e95ca14..82b5ddd 100644
--- a/src/value.hpp
+++ b/src/value.hpp
@@ -893,11 +893,19 @@ namespace Exiv2 {
         AutoPtr clone() const;
         virtual long count() const;
         /*!
-          @brief Return the <EM>n</EM>-th component of the value as a string.
-                 The behaviour of this method may be undefined if there is no
-                 <EM>n</EM>-th component.
+          @brief Return the text value associated with the default language
+                 qualifier 
-- 
exiv2 packaging