[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=260b9af

The following commit has been merged in the master branch:
commit 260b9af10be07bf404b09042e4b34654da50a366
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sat Oct 8 16:30:21 2005 +0000

    Removed hasMakerNote() from ExifData and made it a free function. Added setting to generate an XML tagfile to Doxyfile.
---
 config/Doxyfile |  2 +-
 src/exif.cpp    | 18 +++++++++---------
 src/exif.hpp    |  9 +++++----
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/config/Doxyfile b/config/Doxyfile
index 7797496..f248b9b 100644
--- a/config/Doxyfile
+++ b/config/Doxyfile
@@ -1032,7 +1032,7 @@ TAGFILES               =
 # When a file name is specified after GENERATE_TAGFILE, doxygen will create 
 # a tag file that is based on the input files it reads.
 
-GENERATE_TAGFILE       = 
+GENERATE_TAGFILE       = html/exiv2.xml
 
 # If the ALLEXTERNALS tag is set to YES all external classes will be listed 
 # in the class index. If set to NO only the inherited external classes 
diff --git a/src/exif.cpp b/src/exif.cpp
index 40f8f87..0bd531c 100644
--- a/src/exif.cpp
+++ b/src/exif.cpp
@@ -899,15 +899,6 @@ namespace Exiv2 {
         return rc;
     } // ExifData::stdThumbPosition
 
-    bool ExifData::hasMakerNote() const
-    {
-        const_iterator e = end();
-        for (const_iterator md = begin(); md != e; ++md) {
-            if (ExifTags::isMakerIfd(md->ifdId())) return true;
-        }
-        return false;
-    } // ExifData::hasMakerNote
-
     ByteOrder ExifData::byteOrder() const
     {
         if (pTiffHeader_) return pTiffHeader_->byteOrder();
@@ -1132,6 +1123,15 @@ namespace Exiv2 {
     // *************************************************************************
     // free functions
 
+    bool 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;
+        }
+        return false;
+    } // hasMakerNote
+
     void addToIfd(Ifd& ifd,
                   ExifMetadata::const_iterator begin,
                   ExifMetadata::const_iterator end,
diff --git a/src/exif.hpp b/src/exif.hpp
index 0790c0e..2af840b 100644
--- a/src/exif.hpp
+++ b/src/exif.hpp
@@ -718,10 +718,6 @@ namespace Exiv2 {
          */
         ByteOrder byteOrder() const;
         /*!
-          @brief Returns true if at least one makernote tag exists, else false.
-         */
-        bool hasMakerNote() const;
-        /*!
           @brief Write the thumbnail image to a file. A filename extension
                  is appended to \em path according to the image type of the
                  thumbnail, so \em path should not include an extension.
@@ -871,6 +867,11 @@ namespace Exiv2 {
         return exifDatum;
     }
     /*!
+      @brief Returns true if at least one Exif makernote tag exists in the 
+             Exif metadata, else false.
+    */
+    bool 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
              IFD to the list of directory entries of ifd.  No duplicate checks

-- 
exiv2 packaging