[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=02f48be

The following commit has been merged in the master branch:
commit 02f48be40c16c4f2a4f47257f61c5bf074ec8a6a
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Thu Jul 5 11:09:04 2012 +0000

    #831: Also delete image tags from the Exif container during encoding.
---
 src/tiffvisitor.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/tiffvisitor.cpp b/src/tiffvisitor.cpp
index bc66b10..3212088 100644
--- a/src/tiffvisitor.cpp
+++ b/src/tiffvisitor.cpp
@@ -820,10 +820,6 @@ namespace Exiv2 {
     {
         assert(object != 0);
 
-        // Skip image tags of existing TIFF image - they were copied earlier -
-        // but add and encode image tags of new images (creation)
-        if (isImageTag(object->tag(), object->group())) return;
-
         ExifData::iterator pos = exifData_.end();
         const Exifdatum* ed = datum;
         if (ed == 0) {
@@ -855,7 +851,9 @@ namespace Exiv2 {
             // duplicate tags
             object->idx_ = ed->idx();
         }
-        if (ed) {
+        // Skip encoding image tags of existing TIFF image - they were copied earlier -
+        // but encode image tags of new images (creation)
+        if (ed && !isImageTag(object->tag(), object->group())) {
             const EncoderFct fct = findEncoderFct_(make_, object->tag(), object->group());
             if (fct) {
                 // If an encoding function is registered for the tag, use it

-- 
exiv2 packaging