[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=47aad1f

The following commit has been merged in the master branch:
commit 47aad1f393ba00a9df45dfb667afb9578a7c16bb
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sun Jul 31 09:35:15 2005 +0000

    Added experimental bool ExifData::hasMakerNote() method
---
 src/exif.cpp | 9 +++++++++
 src/exif.hpp | 4 ++++
 2 files changed, 13 insertions(+)

diff --git a/src/exif.cpp b/src/exif.cpp
index 73685ca..512274f 100644
--- a/src/exif.cpp
+++ b/src/exif.cpp
@@ -899,6 +899,15 @@ 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();
diff --git a/src/exif.hpp b/src/exif.hpp
index b5091b7..dd902ce 100644
--- a/src/exif.hpp
+++ b/src/exif.hpp
@@ -718,6 +718,10 @@ 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.

-- 
exiv2 packaging