[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=43b8c07

The following commit has been merged in the master branch:
commit 43b8c071765795a4cd50a5d150cf9535b7cdb937
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Thu Sep 25 14:41:37 2008 +0000

    Always add Exif.Photo.Makernote tag, even if the makernote is decoded.
---
 src/tiffvisitor.cpp | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/tiffvisitor.cpp b/src/tiffvisitor.cpp
index f0f3458..6f95b93 100644
--- a/src/tiffvisitor.cpp
+++ b/src/tiffvisitor.cpp
@@ -203,7 +203,8 @@ namespace Exiv2 {
 
     void TiffDecoder::visitMnEntry(TiffMnEntry* object)
     {
-        if (!object->mn_) decodeTiffEntry(object);
+        // Always decode binary makernote tag
+        decodeTiffEntry(object);
     }
 
     void TiffDecoder::visitIfdMakernote(TiffIfdMakernote* /*object*/)
@@ -532,7 +533,15 @@ namespace Exiv2 {
     void TiffEncoder::visitMnEntry(TiffMnEntry* object)
     {
         // Test is required here as well as in the callback encoder function
-        if (!object->mn_) encodeTiffComponent(object);
+        if (!object->mn_) {
+            encodeTiffComponent(object);
+        }
+        else if (del_) {
+            // The makernote is made up of decoded tags, delete binary tag
+            ExifKey key(object->tag(), tiffGroupName(object->group()));
+            ExifData::iterator pos = exifData_.findKey(key);
+            if (pos != exifData_.end()) exifData_.erase(pos);
+        }
     }
 
     void TiffEncoder::visitIfdMakernote(TiffIfdMakernote* object)

-- 
exiv2 packaging