[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=367faec

The following commit has been merged in the master branch:
commit 367faecf0c45ac3fce7cd64f9966426de3ae24ec
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sat Aug 26 06:38:16 2006 +0000

    Changed exiv2 del command to delete all occurences of a tag (Toff)
---
 src/actions.cpp | 16 ++++++++++------
 src/exiv2.1     |  2 +-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/actions.cpp b/src/actions.cpp
index 88fb70b..15b7ac4 100644
--- a/src/actions.cpp
+++ b/src/actions.cpp
@@ -1235,14 +1235,18 @@ namespace Action {
         Exiv2::ExifData &exifData = image_->exifData();
         Exiv2::IptcData &iptcData = image_->iptcData();
         if (modifyCmd.metadataId_ == exif) {
-            Exiv2::ExifData::iterator pos =
-                exifData.findKey(Exiv2::ExifKey(modifyCmd.key_));
-            if (pos != exifData.end()) exifData.erase(pos);
+            Exiv2::ExifData::iterator pos;
+            Exiv2::ExifKey exifKey = Exiv2::ExifKey(modifyCmd.key_);
+            while((pos = exifData.findKey(exifKey)) != exifData.end()) {
+                exifData.erase(pos);
+            }
         }
         if (modifyCmd.metadataId_ == iptc) {
-            Exiv2::IptcData::iterator pos =
-                iptcData.findKey(Exiv2::IptcKey(modifyCmd.key_));
-            if (pos != iptcData.end()) iptcData.erase(pos);
+            Exiv2::IptcData::iterator pos;
+            Exiv2::IptcKey iptcKey = Exiv2::IptcKey(modifyCmd.key_);
+            while((pos = iptcData.findKey(iptcKey)) != iptcData.end()) {
+                iptcData.erase(pos);
+            }
         }
     }
 
diff --git a/src/exiv2.1 b/src/exiv2.1
index d53dff4..2183d6d 100644
--- a/src/exiv2.1
+++ b/src/exiv2.1
@@ -237,7 +237,7 @@ Add a tag (unless 
Ikey
P is a non\-repeatable IPTC key; nothing
 prevents you from adding duplicate EXIF tags).
 .TP
 .B del
-Delete a tag (requires only a 
Ikey
P).
+Delete all occurences of a tag (requires only a 
Ikey
P).
 .TP
 .I key
 Exiv2 EXIF or IPTC key.

-- 
exiv2 packaging