[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=748fc06

The following commit has been merged in the master branch:
commit 748fc06fefca3d90017eb2001d11a6115886648e
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Fri Dec 29 02:13:36 2006 +0000

    Fixed doc. (Marco Piovanelli)
---
 src/exif.hpp | 22 ++++++++--------------
 src/iptc.hpp | 24 +++++++++---------------
 2 files changed, 17 insertions(+), 29 deletions(-)

diff --git a/src/exif.hpp b/src/exif.hpp
index ea242c4..a5de345 100644
--- a/src/exif.hpp
+++ b/src/exif.hpp
@@ -586,22 +586,19 @@ namespace Exiv2 {
         //! End of the metadata
         iterator end() { return exifMetadata_.end(); }
         /*!
-          @brief Find a Exifdatum with the given \em key, return an iterator to
-                 it.  If multiple metadata with the same key exist, it is
-                 undefined which of the matching metadata is found.
+          @brief Find the first Exifdatum with the given \em key, return an 
+                 iterator to it.  
          */
         iterator findKey(const ExifKey& key);
         /*!
-          @brief Find the Exifdatum with the given \em ifdId and \em idx,
+          @brief Find the first Exifdatum with the given \em ifdId and \em idx,
                  return an iterator to it.
 
           This method can be used to uniquely identify an exifdatum that was
           created from an IFD or from the makernote (with idx greater than
           0). Metadata created by an application (not read from an IFD or a
           makernote) all have their idx field set to 0, i.e., they cannot be
-          uniquely identified with this method.  If multiple metadata with the
-          same key exist, it is undefined which of the matching metadata is
-          found.
+          uniquely identified with this method.
          */
         iterator findIfdIdIdx(IfdId ifdId, int idx);
         /*!
@@ -694,22 +691,19 @@ namespace Exiv2 {
         //! End of the metadata
         const_iterator end() const { return exifMetadata_.end(); }
         /*!
-          @brief Find an exifdatum with the given \em key, return a const
-                 iterator to it.  If multiple metadata with the same key exist,
-                 it is undefined which of the matching metadata is found.
+          @brief Find the first Exifdatum with the given \em key, return a const
+                 iterator to it.
          */
         const_iterator findKey(const ExifKey& key) const;
         /*!
-          @brief Find the exifdatum with the given \em ifdId and \em idx,
+          @brief Find the first Exifdatum with the given \em ifdId and \em idx,
                  return an iterator to it.
 
           This method can be used to uniquely identify a Exifdatum that was
           created from an IFD or from the makernote (with idx greater than
           0). Metadata created by an application (not read from an IFD or a
           makernote) all have their idx field set to 0, i.e., they cannot be
-          uniquely identified with this method.  If multiple metadata with the
-          same key exist, it is undefined which of the matching metadata is
-          found.
+          uniquely identified with this method.
          */
         const_iterator findIfdIdIdx(IfdId ifdId, int idx) const;
         //! Return true if there is no Exif metadata
diff --git a/src/iptc.hpp b/src/iptc.hpp
index 3e3dc57..6544ccc 100644
--- a/src/iptc.hpp
+++ b/src/iptc.hpp
@@ -340,17 +340,14 @@ namespace Exiv2 {
         iterator begin() { return iptcMetadata_.begin(); }
         //! End of the metadata
         iterator end() { return iptcMetadata_.end(); }
-        /*!
-          @brief Find a Iptcdatum with the given key, return an iterator to it.
-                 If multiple entries with the same key exist, it is undefined
-                 which of the matching metadata is found.
+        /*!  
+          @brief Find the first Iptcdatum with the given key, return an iterator
+                 to it.
          */
         iterator findKey(const IptcKey& key);
         /*!
-          @brief Find a Iptcdatum with the given record and dataset it,
-                return a const iterator to it. If multiple entries with the
-                same Ids exists, it is undefined which of the matching
-                metadata is found.
+          @brief Find the first Iptcdatum with the given record and dataset it,
+                return a const iterator to it.
          */
         iterator findId(uint16_t dataset,
                         uint16_t record = IptcDataSets::application2);
@@ -370,16 +367,13 @@ namespace Exiv2 {
          */
         DataBuf copy() const;
         /*!
-          @brief Find an Iptcdatum with the given key, return a const iterator
-                 to it.  If multiple metadata with the same key exist it is
-                 undefined which of the matching metadata is found.
+          @brief Find the first Iptcdatum with the given key, return a const 
+                 iterator to it.
          */
         const_iterator findKey(const IptcKey& key) const;
         /*!
-          @brief Find a Iptcdatum with the given record and dataset number,
-                return a const iterator to it.  If multiple metadata with the
-                same Ids exist it is undefined which of the matching
-                metadata is found.
+          @brief Find the first Iptcdatum with the given record and dataset 
+                 number, return a const iterator to it.
          */
         const_iterator findId(uint16_t dataset,
                               uint16_t record = IptcDataSets::application2) const;

-- 
exiv2 packaging