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

The following commit has been merged in the master branch:
commit 02ace626ceab8568ad0cf646bfa0255b26695a41
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Thu Nov 16 11:14:18 2006 +0000

    Fixed ExifData::op= to update IFD pointers of Nikon3 and Fujifilm makernotes correctly. This solves the issues recreated with exiv2iface-test of #496.
---
 src/ifd.cpp       | 2 +-
 src/makernote.cpp | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/ifd.cpp b/src/ifd.cpp
index 753c389..916868e 100644
--- a/src/ifd.cpp
+++ b/src/ifd.cpp
@@ -483,7 +483,7 @@ namespace Exiv2 {
                 this->add(e);
             }
         }
-        if (!alloc_) pBase_ = const_cast<byte*>(buf + shift);
+        if (!alloc_) pBase_ = const_cast<byte*>(buf);
         if (rc) this->clear();
 
         return rc;
diff --git a/src/makernote.cpp b/src/makernote.cpp
index 895af0c..4c7074c 100644
--- a/src/makernote.cpp
+++ b/src/makernote.cpp
@@ -142,9 +142,7 @@ namespace Exiv2 {
 
     void IfdMakerNote::updateBase(byte* pNewBase)
     {
-        if (absShift_) {
-            ifd_.updateBase(pNewBase);
-        }
+        ifd_.updateBase(pNewBase);
     }
 
     int IfdMakerNote::checkHeader() const

-- 
exiv2 packaging