[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=8c1e79b

The following commit has been merged in the master branch:
commit 8c1e79bbd3ac0083dcb87a3e7beea1c89a2a0200
Author: Robin Mills <robin at clanmills.com>
Date:   Fri Apr 10 10:13:16 2015 +0000

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

diff --git a/samples/exiv2json.cpp b/samples/exiv2json.cpp
index ee24408..d6189b4 100644
--- a/samples/exiv2json.cpp
+++ b/samples/exiv2json.cpp
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
-// exif2json.cpp, $Id: exif2json.cpp 518 2013-05-10 23:53:00Z robinwmills at gmail.com $
-// Sample program to print the Exif metadata in JSON format
+// exiv2json.cpp, $Id: exiv2json.cpp 518 2013-05-10 23:53:00Z robinwmills at gmail.com $
+// Sample program to print metadata in JSON format
 
 #include <exiv2/exiv2.hpp>
 #include <Jzon.h>
@@ -290,7 +290,7 @@ try {
     	}
 	}
 
-	if ( option == 'i' || option == 'f' ) {
+	if ( option == 'a' || option == 'i' ) {
 		Exiv2::IptcData &iptcData = image->iptcData();
 		for (Exiv2::IptcData::const_iterator i = iptcData.begin(); i != iptcData.end(); ++i) {
 			std::string name   ;

-- 
exiv2 packaging