third_party/exiv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correction to r3925.

Browse Source
This commit is contained in:
Robin Mills 2015-09-03 20:54:26 +00:00
parent 3f1380e91a
commit bbf8b288ba
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
samples/exiv2json.cpp
View File

@ -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 ;