[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=63883fa

The following commit has been merged in the master branch:
commit 63883fa21f7392640f6a6d06640ca1f62607cbc8
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Mon May 24 02:23:25 2004 +0000

    Code and documentation cleanup
---
 src/canonmn.cpp | 8 ++++----
 src/canonmn.hpp | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index 21ce9a8..ad6b170 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -20,7 +20,7 @@
  */
 /*
   File:      canonmn.cpp
-  Version:   $Name:  $ $Revision: 1.7 $
+  Version:   $Name:  $ $Revision: 1.8 $
   Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
   History:   18-Feb-04, ahu: created
              07-Mar-04, ahu: isolated as a separate component
@@ -30,7 +30,7 @@
  */
 // *****************************************************************************
 #include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.7 $ $RCSfile: canonmn.cpp,v $")
+EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.8 $ $RCSfile: canonmn.cpp,v $")
 
 // *****************************************************************************
 // included header files
@@ -72,9 +72,9 @@ namespace Exiv2 {
     {
     }
 
-    MakerNote* CanonMakerNote::clone(bool alloc) const 
+    CanonMakerNote* CanonMakerNote::clone(bool alloc) const 
     {
-        return createCanonMakerNote(alloc); 
+        return new CanonMakerNote(alloc); 
     }
 
     std::ostream& CanonMakerNote::printTag(std::ostream& os, 
diff --git a/src/canonmn.hpp b/src/canonmn.hpp
index 1bdc174..52bba46 100644
--- a/src/canonmn.hpp
+++ b/src/canonmn.hpp
@@ -21,9 +21,9 @@
 /*!
   @file    canonmn.hpp
   @brief   Canon MakerNote implemented according to the specification
-           "EXIF MakerNote of Canon" <http://www.burren.cx/david/canon.html>
-           by David Burren
-  @version $Name:  $ $Revision: 1.5 $
+           <a href="http://www.burren.cx/david/canon.html">
+           EXIF MakerNote of Canon</a> by David Burren
+  @version $Name:  $ $Revision: 1.6 $
   @author  Andreas Huggel (ahu)
            <a href="mailto:ahuggel at gmx.net">ahuggel at gmx.net</a>
   @date    18-Feb-04, ahu: created
@@ -84,7 +84,7 @@ namespace Exiv2 {
 
         //! @name Accessors
         //@{        
-        MakerNote* clone(bool alloc =true) const;
+        CanonMakerNote* clone(bool alloc =true) const;
         //! Return the name of the makernote section ("Canon")
         std::string sectionName(uint16 tag) const { return sectionName_; }
         std::ostream& printTag(std::ostream& os,

-- 
exiv2 packaging