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

The following commit has been merged in the master branch:
commit af8e778a55a85dafabd154e704fe0ea016331334
Author: Robin Mills <robin at clanmills.com>
Date:   Fri Apr 10 18:44:43 2015 +0000

    Fixing more typos.
---
 samples/exiv2json.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/samples/exiv2json.cpp b/samples/exiv2json.cpp
index 72163d0..3f19bcc 100644
--- a/samples/exiv2json.cpp
+++ b/samples/exiv2json.cpp
@@ -112,7 +112,7 @@ Jzon::Node& objectForKey(const std::string Key,Jzon::Object& rt,std::string& nam
 	return addToTree(rt,tokens,l);
 
 #if 0
-	// The recursion could be expressed with these if statements:
+	// The recursion could be expressed by these if statements:
 	// Go to the root, and climb out, adding objects or arrays to create the tree
 	// The leaf is pushed onto the top by the caller of objectForKey!
 	if ( l == 1 ) return                                  addToTree(rt,tokens[0]);
@@ -147,10 +147,10 @@ void push(Jzon::Node& json,const std::string& key,T i)
 
     switch ( i->typeId() ) {
         case Exiv2::xmpText:
-			 if ( ::isObject(value) ) {
+			 if (        ::isObject(value) ) {
 				 Jzon::Object   v;
 				 STORE(json,key,v);
-			 } else if ( isArray(value) ) {
+			 } else if ( ::isArray(value) ) {
 				 Jzon::Array    v;
 				 STORE(json,key,v);
 			 } else {

-- 
exiv2 packaging