[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=454d599

The following commit has been merged in the master branch:
commit 454d599da9eb4f1b79d2d5b5e3738fe9a010a4c1
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sat Sep 20 07:11:54 2008 +0000

    Fixed issue with custom namespaces ending with a #. (Reported by chrysn)
---
 src/error.cpp      | 2 +-
 src/properties.cpp | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/error.cpp b/src/error.cpp
index fe97d7c..bcd456f 100644
--- a/src/error.cpp
+++ b/src/error.cpp
@@ -83,7 +83,7 @@ namespace {
         { 33, N_("This does not look like a CRW image") },
         { 34, N_("%1: Not supported") }, // %1=function
         { 35, N_("No namespace info available for XMP prefix `%1'") }, // %1=prefix
-        { 36, N_("No prefix registered for namespace `%1'") }, // %1=namespace
+        { 36, N_("No prefix registered for namespace `%2', needed for property path `%1')") }, // %1=namespace
         { 37, N_("Size of %1 JPEG segment is larger than 65535 bytes") }, // %1=type of metadata (Exif, IPTC, JPEG comment)
         { 38, N_("Unhandled Xmpdatum %1 of type %2") }, // %1=key, %2=value type
         { 39, N_("Unhandled XMP node %1 with opt=%2") }, // %1=key, %2=XMP Toolkit option flags
diff --git a/src/properties.cpp b/src/properties.cpp
index ea1b99f..bbdca2e 100644
--- a/src/properties.cpp
+++ b/src/properties.cpp
@@ -764,7 +764,8 @@ namespace Exiv2 {
     std::string XmpProperties::prefix(const std::string& ns)
     {
         std::string ns2 = ns;
-        if (ns2.substr(ns2.size() - 1, 1) != "/") ns2 += "/";
+        if (   ns2.substr(ns2.size() - 1, 1) != "/"
+            && ns2.substr(ns2.size() - 1, 1) != "#") ns2 += "/";
         NsRegistry::const_iterator i = nsRegistry_.find(ns2);
         std::string p;
         if (i != nsRegistry_.end()) {

-- 
exiv2 packaging