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

The following commit has been merged in the master branch:
commit 7f157970eb746340fe953cf848bd36e52862cd99
Author: Robin Mills <robin at clanmills.com>
Date:   Sat Aug 25 13:47:06 2012 +0000

    Changed symantics of exiv2 -g grep-tag to be a substring match (so -g GPS will match every GPS key).
---
 src/actions.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/actions.cpp b/src/actions.cpp
index bdc631f..1e4c7ae 100644
--- a/src/actions.cpp
+++ b/src/actions.cpp
@@ -546,12 +546,13 @@ namespace Action {
 
     bool Print::grepTag(const std::string& key)
     {
-        if (Params::instance().keys_.empty()) return true;
-        for (Params::Keys::const_iterator k = Params::instance().keys_.begin();
-             k != Params::instance().keys_.end(); ++k) {
-            if (*k == key) return true;
+        bool result=Params::instance().keys_.empty();
+		if (!result) 
+			for (Params::Keys::const_iterator k = Params::instance().keys_.begin();
+				!result && k != Params::instance().keys_.end(); ++k) {
+					result = key.find(*k) != std::string::npos;
         }
-        return false;
+        return result ;
     }
 
     void Print::printMetadatum(const Exiv2::Metadatum& md, const Exiv2::Image* pImage)

-- 
exiv2 packaging