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

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

    Correction to r3925.
---
 samples/exiv2json.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/samples/exiv2json.cpp b/samples/exiv2json.cpp
index 834736f..3619284 100644
--- a/samples/exiv2json.cpp
+++ b/samples/exiv2json.cpp
@@ -44,10 +44,9 @@ struct Token {
     int         i; // index (indexed from 1) eg History[1]/stEvt:action
 };
 typedef std::vector<Token>    Tokens;
-typedef std::set<std::string> Namespaces;
 
 // "XMP.xmp.MP.RegionInfo/MPRI:Regions[1]/MPReg:Rectangle"
-bool getToken(std::string& in,Token& token,Namespaces* pNS=NULL)
+bool getToken(std::string& in,Token& token,Exiv2::StringSet* pNS=NULL)
 {
     bool result = false;
     bool ns     = false;
@@ -102,7 +101,7 @@ Jzon::Node& recursivelyBuildTree(Jzon::Node& root,Tokens& tokens,size_t k)
 }
 
 // build the json tree for this key.  return location and discover the name
-Jzon::Node& objectForKey(const std::string Key,Jzon::Object& root,std::string& name,Namespaces* pNS=NULL)
+Jzon::Node& objectForKey(const std::string Key,Jzon::Object& root,std::string& name,Exiv2::StringSet* pNS=NULL)
 {
     // Parse the key
     Tokens      tokens ;

-- 
exiv2 packaging