[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=863772f

The following commit has been merged in the master branch:
commit 863772fba1b136e98ecf1e60f38ee7ee95bed14a
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Fri Jan 20 08:39:28 2012 +0000

    #799: Improved doc, tweaks.
---
 src/properties.cpp | 12 +++++-------
 src/properties.hpp |  5 +++++
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/properties.cpp b/src/properties.cpp
index ff37296..1f4839f 100644
--- a/src/properties.cpp
+++ b/src/properties.cpp
@@ -1186,7 +1186,7 @@ namespace Exiv2 {
     {
         std::string prefix = key.groupName();
         std::string property = key.tagName();
-        // If the key is that of a nested property, determine the type of the innermost element
+        // If property is a path for a nested property, determines the innermost element
         std::string::size_type i = property.find_last_of('/');
         if (i != std::string::npos) {
             for (; i != std::string::npos && !isalpha(property[i]); ++i) {}
@@ -1195,13 +1195,11 @@ namespace Exiv2 {
             if (i != std::string::npos) {
                 prefix = property.substr(0, i);
                 property = property.substr(i+1);
-                /*
-                std::cout << "Nested key: " << key.key()
-                          << ", prefix: " << prefix
-                          << ", property: " << property
-                          << "
";
-                */
             }
+#ifdef DEBUG
+            std::cout << "Nested key: " << key.key() << ", prefix: " << prefix
+                      << ", property: " << property << "
";
+#endif
         }
         const XmpPropertyInfo* pl = propertyList(prefix);
         if (!pl) return 0;
diff --git a/src/properties.hpp b/src/properties.hpp
index d6d0fad..0b04859 100644
--- a/src/properties.hpp
+++ b/src/properties.hpp
@@ -131,6 +131,11 @@ namespace Exiv2 {
         static TypeId propertyType(const XmpKey& key);
         /*!
           @brief Return information for the property for key.
+
+          If the key is a path to a nested property (one which contains a slash,
+          like 
-- 
exiv2 packaging