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

The following commit has been merged in the master branch:
commit d00212f4f681f1ff93b580c82bc9b29154b8b8cc
Author: Robin Mills <robin at clanmills.com>
Date:   Sat Apr 11 08:09:06 2015 +0000

    Fixing typos.
---
 samples/exiv2json.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/samples/exiv2json.cpp b/samples/exiv2json.cpp
index 3dbb732..4bf35d5 100644
--- a/samples/exiv2json.cpp
+++ b/samples/exiv2json.cpp
@@ -78,8 +78,8 @@ Jzon::Node& addToTree(Jzon::Node& r1,Token token)
 
 	if (  r1.IsObject() ) {
 		Jzon::Object& o1 = r1.AsObject();
-		if (  !o1.Has(key) ) o1.Add(key,empty);
-		return o1.Get(key);
+		if (   !o1.Has(key) ) o1.Add(key,empty);
+		return  o1.Get(key);
 	} else if ( r1.IsArray() ) {
 		Jzon::Array& a1 = r1.AsArray();
 		while ( a1.GetCount() <= index ) a1.Add(empty);
@@ -238,8 +238,8 @@ void fileSystemPush(const char* path,Jzon::Node& nfs)
 int main(int argc, char* const argv[])
 try {
     if (argc < 2 || argc > 3) {
-        std::cout << "Usage: " << argv[0] << " [-option] file
";
-        std::cout << "Option: all | exif | iptc | xmp | filesystem" << argv[0] << " [option] file
";
+        std::cout << "Usage: " << argv[0] << " [-option] file"       << std::endl;
+        std::cout << "Option: all | exif | iptc | xmp | filesystem"  << std::endl;
         return 1;
     }
     const char* path   = argv[argc-1];

-- 
exiv2 packaging