[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=1d655bb

The following commit has been merged in the master branch:
commit 1d655bb915d2166aa405615292ab9efff261e1e3
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Fri Mar 19 09:07:13 2004 +0000

    Make IfdMakerNote::read and copy virtual
---
 src/makernote.hpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/makernote.hpp b/src/makernote.hpp
index 0d0b7fe..66f6415 100644
--- a/src/makernote.hpp
+++ b/src/makernote.hpp
@@ -22,7 +22,7 @@
   @file    makernote.hpp
   @brief   Contains the %Exif %MakerNote interface, IFD %MakerNote and a 
            MakerNote factory
-  @version $Name:  $ $Revision: 1.10 $
+  @version $Name:  $ $Revision: 1.11 $
   @author  Andreas Huggel (ahu)
            <a href="mailto:ahuggel at gmx.net">ahuggel at gmx.net</a>
   @date    18-Feb-04, ahu: created
@@ -239,8 +239,11 @@ namespace Exif {
 
         //! @name Manipulators
         //@{
-        int read(const char* buf, long len, ByteOrder byteOrder, long offset);
-        long copy(char* buf, ByteOrder byteOrder, long offset);
+        virtual int read(const char* buf, 
+                         long len, 
+                         ByteOrder byteOrder, 
+                         long offset);
+        virtual long copy(char* buf, ByteOrder byteOrder, long offset);
         void add(const Entry& entry) { ifd_.add(entry); }
         Entries::iterator begin() { return ifd_.begin(); }
         Entries::iterator end() { return ifd_.end(); }

-- 
exiv2 packaging