[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=4b86ee4

The following commit has been merged in the master branch:
commit 4b86ee45830beb7edd4b7cd50b9be89b52ab1852
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sun Dec 5 04:13:00 2004 +0000

    Fixed ExifData::eraseThumbnail(). Bug #401
---
 src/exif.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/exif.cpp b/src/exif.cpp
index 5e4d015..99e3446 100644
--- a/src/exif.cpp
+++ b/src/exif.cpp
@@ -736,6 +736,8 @@ namespace Exiv2 {
 
     long ExifData::eraseThumbnail()
     {
+        // First, determine if the thumbnail is at the end of the Exif data
+        bool stp = stdThumbPosition();
         // Delete all Exif.Thumbnail.* (IFD1) metadata 
         ExifMetadata::iterator i = begin(); 
         while (i != end()) {
@@ -747,12 +749,13 @@ namespace Exiv2 {
             }
         }
         long delta = 0;
-        if (stdThumbPosition()) {
+        if (stp) {
             delta = size_;
             if (size_ > 0 && ifd0_.next() > 0) {
                 // Truncate IFD1 and thumbnail data from the data buffer
                 size_ = ifd0_.next();
                 ifd0_.setNext(0, byteOrder());
+                ifd1_.clear();
             }
             delta -= size_;
         }

-- 
exiv2 packaging