[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=8c62363

The following commit has been merged in the master branch:
commit 8c623635e90ddf7e7d72d6b0e206668f36ba67ac
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sun Oct 9 05:00:43 2005 +0000

    Changed hasMakerNote to return an IfdId instead of bool
---
 src/exif.cpp | 6 +++---
 src/exif.hpp | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/exif.cpp b/src/exif.cpp
index 0bd531c..fd0780a 100644
--- a/src/exif.cpp
+++ b/src/exif.cpp
@@ -1123,13 +1123,13 @@ namespace Exiv2 {
     // *************************************************************************
     // free functions
 
-    bool hasMakerNote(const ExifData& exifData)
+    IfdId hasMakerNote(const ExifData& exifData)
     {
         ExifData::const_iterator e = exifData.end();
         for (ExifData::const_iterator md = exifData.begin(); md != e; ++md) {
-            if (ExifTags::isMakerIfd(md->ifdId())) return true;
+            if (ExifTags::isMakerIfd(md->ifdId())) return md->ifdId();
         }
-        return false;
+        return ifdIdNotSet;
     } // hasMakerNote
 
     void addToIfd(Ifd& ifd,
diff --git a/src/exif.hpp b/src/exif.hpp
index 2af840b..65ad93e 100644
--- a/src/exif.hpp
+++ b/src/exif.hpp
@@ -867,10 +867,10 @@ namespace Exiv2 {
         return exifDatum;
     }
     /*!
-      @brief Returns true if at least one Exif makernote tag exists in the 
-             Exif metadata, else false.
+      @brief Returns the IfdId of the first Exif makernote tag it finds in the 
+             Exif metadata or ifdIdNotSet if there is no Exif makernote tag.
     */
-    bool hasMakerNote(const ExifData& exifData);
+    IfdId hasMakerNote(const ExifData& exifData);
     /*!
       @brief Add all metadata in the range from iterator position begin to
              iterator position end, which have an IFD id matching that of the

-- 
exiv2 packaging