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

The following commit has been merged in the master branch:
commit a1e3bf545f522092a81cb786147f92e18251abc2
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sun Mar 7 02:53:27 2004 +0000

    Fixed IFD to update internal offsets on copy() => copy is not const anymore
---
 src/makernote.cpp | 6 +++---
 src/makernote.hpp | 9 +++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/makernote.cpp b/src/makernote.cpp
index 592db73..a47dc8f 100644
--- a/src/makernote.cpp
+++ b/src/makernote.cpp
@@ -20,7 +20,7 @@
  */
 /*
   File:      makernote.cpp
-  Version:   $Name:  $ $Revision: 1.2 $
+  Version:   $Name:  $ $Revision: 1.3 $
   Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
   History:   18-Feb-04, ahu: created
   Credits:   Canon MakerNote implemented according to the specification
@@ -29,7 +29,7 @@
  */
 // *****************************************************************************
 #include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.2 $ $RCSfile: makernote.cpp,v $")
+EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.3 $ $RCSfile: makernote.cpp,v $")
 
 // *****************************************************************************
 // included header files
@@ -298,7 +298,7 @@ namespace Exif {
         return rc;
     }
 
-    long IfdMakerNote::copy(char* buf, ByteOrder byteOrder, long offset) const
+    long IfdMakerNote::copy(char* buf, ByteOrder byteOrder, long offset)
     {
         return ifd_.copy(buf, byteOrder, offset);
     }
diff --git a/src/makernote.hpp b/src/makernote.hpp
index 94efec6..53f3f9f 100644
--- a/src/makernote.hpp
+++ b/src/makernote.hpp
@@ -21,7 +21,7 @@
 /*!
   @file    makernote.hpp
   @brief   
-  @version $Name:  $ $Revision: 1.2 $
+  @version $Name:  $ $Revision: 1.3 $
   @author  Andreas Huggel (ahu)
            <a href="mailto:ahuggel at gmx.net">ahuggel at gmx.net</a>
   @date    18-Feb-04, ahu: created
@@ -98,9 +98,10 @@ namespace Exif {
         /*!
           @brief Copy (write) the makerNote to the character buffer buf at 
                  position offset (from the start of the TIFF header), encoded
-                 in byte order byteOrder. Return the number of bytes written.
+                 in byte order byteOrder. Update internal offsets if necessary.
+                 Return the number of bytes written.
          */
-        virtual long copy(char* buf, ByteOrder byteOrder, long offset) const =0;
+        virtual long copy(char* buf, ByteOrder byteOrder, long offset) =0;
 
         //! @name Accessors
         //@{
@@ -260,7 +261,7 @@ namespace Exif {
         virtual MakerNote* clone() const =0;
 
         int read(const char* buf, long len, ByteOrder byteOrder, long offset);
-        long copy(char* buf, ByteOrder byteOrder, long offset) const;
+        long copy(char* buf, ByteOrder byteOrder, long offset);
         long size() const;
         Entries::const_iterator begin() const { return ifd_.begin(); }
         Entries::const_iterator end() const { return ifd_.end(); }

-- 
exiv2 packaging