[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=abc73c4

The following commit has been merged in the master branch:
commit abc73c4cb1ec17eb7a7fb8ed92179e7e2784045c
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sat Jun 19 11:18:49 2004 +0000

    Fixed offset adjustment in IfdMakernote::copy
---
 src/makernote.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/makernote.cpp b/src/makernote.cpp
index 8bb584f..7844cd6 100644
--- a/src/makernote.cpp
+++ b/src/makernote.cpp
@@ -20,13 +20,13 @@
  */
 /*
   File:      makernote.cpp
-  Version:   $Name:  $ $Revision: 1.21 $
+  Version:   $Name:  $ $Revision: 1.22 $
   Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
   History:   18-Feb-04, ahu: created
  */
 // *****************************************************************************
 #include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.21 $ $RCSfile: makernote.cpp,v $")
+EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.22 $ $RCSfile: makernote.cpp,v $")
 
 // Define DEBUG_* to output debug information to std::cerr
 #undef DEBUG_MAKERNOTE
@@ -212,10 +212,12 @@ namespace Exiv2 {
         offset_ = offset;
         // Set byte order if none is set yet
         if (byteOrder_ == invalidByteOrder) byteOrder_ = byteOrder;
+        // Adjust the offset
+        offset = absOffset_ ? offset + adjOffset_ : adjOffset_;
 
         long len = 0;
         len += copyHeader(buf);
-        len += ifd_.copy(buf + len, byteOrder_, offset_);
+        len += ifd_.copy(buf + len, byteOrder_, offset);
 
         return len;
     } // IfdMakerNote::copy

-- 
exiv2 packaging