[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=3f1380e

The following commit has been merged in the master branch:
commit 3f1380e91a623789268a2038d4aea8520f598202
Author: Robin Mills <robin at clanmills.com>
Date:   Thu Sep 3 20:51:34 2015 +0000

    #640 Modified XmpParser::getRegisteredNamespaces to use Exiv2::Dictionary.
---
 include/exiv2/xmp.hpp | 5 +++--
 samples/exiv2json.cpp | 6 +++---
 src/xmp.cpp           | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/include/exiv2/xmp.hpp b/include/exiv2/xmp.hpp
index 32ee3eb..f1854cd 100644
--- a/include/exiv2/xmp.hpp
+++ b/include/exiv2/xmp.hpp
@@ -35,6 +35,7 @@
 #include "properties.hpp"
 #include "value.hpp"
 #include "types.hpp"
+#include "datasets.hpp"
 
 // + standard includes
 #include <string>
@@ -375,11 +376,11 @@ namespace Exiv2 {
         static void terminate();
 
         /*!
-         @brief object a map of registered namespaces
+         @brief object a map of registered namespaces (prefix:URI)
 
          This will initialize the Parser if necessary
          */
-        static void getRegisteredNamespaces(std::map<std::string,std::string>& dict);
+        static void getRegisteredNamespaces(Exiv2::Dictionary& dict);
 
 
     private:
diff --git a/samples/exiv2json.cpp b/samples/exiv2json.cpp
index c107ef6..834736f 100644
--- a/samples/exiv2json.cpp
+++ b/samples/exiv2json.cpp
@@ -309,7 +309,7 @@ try {
         Exiv2::XmpData  &xmpData  = image->xmpData();
         if ( !xmpData.empty() ) {
             // get the xmpData and recursively parse into a Jzon Object
-            Namespaces     namespaces;
+            Exiv2::StringSet     namespaces;
             for (Exiv2::XmpData::const_iterator i = xmpData.begin(); i != xmpData.end(); ++i) {
                 std::string name   ;
                 Jzon::Node& object = objectForKey(i->key(),root,name,&namespaces);
@@ -317,12 +317,12 @@ try {
             }
 
             // get the namespace dictionary from XMP
-            std::map<std::string,std::string>         nsDict;
+            Exiv2::Dictionary                         nsDict;
             Exiv2::XmpParser::getRegisteredNamespaces(nsDict);
 
             // create and populate a Jzon::Object for the namespaces
             Jzon::Object    xmlns;
-            for ( Namespaces::const_iterator it = namespaces.begin() ; it != namespaces.end() ; it++ ) {
+            for ( Exiv2::StringSet_i it = namespaces.begin() ; it != namespaces.end() ; it++ ) {
                 std::string ns  = *it       ;
                 std::string uri = nsDict[ns];
                 xmlns.Add(ns,uri);
diff --git a/src/xmp.cpp b/src/xmp.cpp
index bae3bbe..d945ee4 100644
--- a/src/xmp.cpp
+++ b/src/xmp.cpp
@@ -465,7 +465,7 @@ namespace Exiv2 {
         return result;
     }
 
-    void XmpParser::getRegisteredNamespaces(std::map<std::string,std::string>& dict)
+    void XmpParser::getRegisteredNamespaces(Exiv2::Dictionary& dict)
     {
     	bool bInit = !initialized_;
         try {

-- 
exiv2 packaging