[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=07b0657

The following commit has been merged in the master branch:
commit 07b0657060dfc63d196a597892ffb66fa342c0c9
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sat Mar 6 06:37:03 2004 +0000

    Changed signature of makeKey
---
 src/exif.hpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/exif.hpp b/src/exif.hpp
index 80e10be..98c945d 100644
--- a/src/exif.hpp
+++ b/src/exif.hpp
@@ -21,7 +21,7 @@
 /*!
   @file    exif.hpp
   @brief   Encoding and decoding of %Exif data
-  @version $Name:  $ $Revision: 1.23 $
+  @version $Name:  $ $Revision: 1.24 $
   @author  Andreas Huggel (ahu)
            <a href="mailto:ahuggel at gmx.net">ahuggel at gmx.net</a>
   @date    09-Jan-04, ahu: created
@@ -575,11 +575,11 @@ namespace Exif {
      */
     bool cmpMetadataByKey(const Metadatum& lhs, const Metadatum& rhs);
     /*!
-      @brief Return a key for the tag and IFD id.  The key is of the form
+      @brief Return a key for the entry.  The key is of the form
              'ifdItem.sectionName.tagName'.  This function knows about
              MakerNotes, i.e., it will invoke MakerNote::makeKey if necessary.
     */
-    std::string makeKey(uint16 tag, IfdId ifdId, const MakerNote* makerNote);
+    std::string makeKey(const Entry& entry);
     /*!
       @brief Return the tag and IFD id pair for the key. This function knows
              about MakerNotes, i.e., it will forward the request to

-- 
exiv2 packaging