[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=4c79818

The following commit has been merged in the master branch:
commit 4c79818d76225ab5bb1f38fb8629273bf3d13f8d
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Wed Jul 30 11:10:14 2008 +0000

    Register new namespaces with XMP-SDK.
---
 src/properties.cpp | 2 +-
 src/xmp.cpp        | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/properties.cpp b/src/properties.cpp
index 3e905be..97bacd5 100644
--- a/src/properties.cpp
+++ b/src/properties.cpp
@@ -77,7 +77,7 @@ namespace Exiv2 {
         { "http://ns.adobe.com/xap/1.0/bj/",              "xmpBJ",          xmpXmpBJInfo,     N_("XMP Basic Job Ticket schema")               },
         { "http://ns.adobe.com/xap/1.0/t/pg/",            "xmpTPg",         xmpXmpTPgInfo,    N_("XMP Paged-Text schema")                     },
         { "http://ns.adobe.com/xmp/1.0/DynamicMedia/",    "xmpDM",          xmpXmpDMInfo,     N_("XMP Dynamic Media schema")                  },
-        { "http://ns.microsoft.com/Photo/1.0",            "MicrosoftPhoto", xmpMicrosoftInfo, N_("Microsoft Photo schema")                    },
+        { "http://ns.microsoft.com/Photo/1.0/",           "MicrosoftPhoto", xmpMicrosoftInfo, N_("Microsoft Photo schema")                    },
         { "http://ns.adobe.com/pdf/1.3/",                 "pdf",            xmpPdfInfo,       N_("Adobe PDF schema")                          },
         { "http://ns.adobe.com/photoshop/1.0/",           "photoshop",      xmpPhotoshopInfo, N_("Adobe photoshop schema")                    },
         { "http://ns.adobe.com/camera-raw-settings/1.0/", "crs",            xmpCrsInfo,       N_("Camera Raw schema")                         },
diff --git a/src/xmp.cpp b/src/xmp.cpp
index e4fbdc2..b9d71d4 100644
--- a/src/xmp.cpp
+++ b/src/xmp.cpp
@@ -371,6 +371,8 @@ namespace Exiv2 {
         if (!initialized_) {
 #ifdef EXV_HAVE_XMP_TOOLKIT
             initialized_ = SXMPMeta::Initialize();
+            SXMPMeta::RegisterNamespace("http://www.digikam.org/ns/1.0/", "digiKam", 0);
+            SXMPMeta::RegisterNamespace("http://ns.microsoft.com/Photo/1.0/", "MicrosoftPhoto", 0);
 #else
             initialized_ = true;
 #endif

-- 
exiv2 packaging