[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=169cbdd

The following commit has been merged in the master branch:
commit 169cbdd9dcbd868db6033567d876ab11737159dd
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sat May 13 05:39:16 2006 +0000

    Added Metadatum::tagLabel() and Key::tagLabel() and ExifTags::tagLabel(), which will replace the now deprecated ExifTags::tagTitle() in a future version.
---
 src/datasets.hpp  |  2 ++
 src/exif.hpp      |  5 ++---
 src/iptc.hpp      |  2 ++
 src/metadatum.hpp |  4 ++++
 src/tags.cpp      |  9 +++++++--
 src/tags.hpp      | 13 ++++++++++++-
 6 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/src/datasets.hpp b/src/datasets.hpp
index 140d344..41c9309 100644
--- a/src/datasets.hpp
+++ b/src/datasets.hpp
@@ -315,6 +315,8 @@ namespace Exiv2 {
         virtual std::string groupName() const { return recordName(); }
         virtual std::string tagName() const
             { return IptcDataSets::dataSetName(tag_, record_); }
+        virtual std::string tagLabel() const
+            { return IptcDataSets::dataSetTitle(tag_, record_); }
         virtual uint16_t tag() const { return tag_; }
 
         AutoPtr clone() const;
diff --git a/src/exif.hpp b/src/exif.hpp
index ee1bf11..a2e7a0a 100644
--- a/src/exif.hpp
+++ b/src/exif.hpp
@@ -173,13 +173,12 @@ namespace Exiv2 {
         //! Return the key of the %Exifdatum.
         std::string key() const
             { return key_.get() == 0 ? "" : key_->key(); }
-        //! Return the name of the group (the second part of the key)
         std::string groupName() const
             { return key_.get() == 0 ? "" : key_->groupName(); }
-        //! Return the name of the tag (which is also the third part of the key)
         std::string tagName() const
             { return key_.get() == 0 ? "" : key_->tagName(); }
-        //! Return the tag
+        std::string tagLabel() const
+            { return key_.get() == 0 ? "" : key_->tagLabel(); }
         uint16_t tag() const
             { return key_.get() == 0 ? 0xffff : key_->tag(); }
         //! Return the IFD id
diff --git a/src/iptc.hpp b/src/iptc.hpp
index 17e22c2..3cbf5f9 100644
--- a/src/iptc.hpp
+++ b/src/iptc.hpp
@@ -151,6 +151,8 @@ namespace Exiv2 {
          */
         std::string tagName() const
             { return key_.get() == 0 ? "" : key_->tagName(); }
+        std::string tagLabel() const
+            { return key_.get() == 0 ? "" : key_->tagLabel(); }
         //! Return the tag (aka dataset) number
         uint16_t tag() const
             { return key_.get() == 0 ? 0 : key_->tag(); }
diff --git a/src/metadatum.hpp b/src/metadatum.hpp
index 4ae7ee0..701ddee 100644
--- a/src/metadatum.hpp
+++ b/src/metadatum.hpp
@@ -79,6 +79,8 @@ namespace Exiv2 {
         virtual std::string groupName() const =0;
         //! Return the name of the tag (which is also the third part of the key)
         virtual std::string tagName() const =0;
+        //! Return a label for the tag
+        virtual std::string tagLabel() const =0;
         //! Return the tag number
         virtual uint16_t tag() const =0;
         /*!
@@ -172,6 +174,8 @@ namespace Exiv2 {
         virtual std::string key() const =0;
         //! Return the name of the tag (which is also the third part of the key)
         virtual std::string tagName() const =0;
+        //! Return a label for the tag 	 
+        virtual std::string tagLabel() const =0;
         //! Return the tag
         virtual uint16_t tag() const =0;
         //! Return the type id of the value
diff --git a/src/tags.cpp b/src/tags.cpp
index 5b400dc..bcf7146 100644
--- a/src/tags.cpp
+++ b/src/tags.cpp
@@ -408,7 +408,7 @@ namespace Exiv2 {
         return os.str();
     } // ExifTags::tagName
 
-    const char* ExifTags::tagTitle(uint16_t tag, IfdId ifdId)
+    const char* ExifTags::tagLabel(uint16_t tag, IfdId ifdId)
     {
         if (isExifIfd(ifdId)) {
             int idx = tagInfoIdx(tag, ifdId);
@@ -420,7 +420,7 @@ namespace Exiv2 {
             if (tagInfo != 0) return tagInfo->title_;
         }
         return "";
-    } // ExifTags::tagTitle
+    } // ExifTags::tagLabel
 
     const char* ExifTags::tagDesc(uint16_t tag, IfdId ifdId)
     {
@@ -644,6 +644,11 @@ namespace Exiv2 {
         return ExifTags::tagName(tag_, ifdId_);
     }
 
+    std::string ExifKey::tagLabel() const 	 
+    {
+        return ExifTags::tagLabel(tag_, ifdId_);
+    }
+
     ExifKey::AutoPtr ExifKey::clone() const
     {
         return AutoPtr(clone_());
diff --git a/src/tags.hpp b/src/tags.hpp
index 30e9482..14200c8 100644
--- a/src/tags.hpp
+++ b/src/tags.hpp
@@ -187,13 +187,23 @@ namespace Exiv2 {
          */
         static std::string tagName(uint16_t tag, IfdId ifdId);
         /*!
+          @brief Return the title (label) of the tag. 
+                 (Deprecated, use tagLabel() instead.)
+
+          @param tag The tag
+          @param ifdId IFD id
+          @return The title (label) of the tag.
+         */
+        static const char* tagTitle(uint16_t tag, IfdId ifdId)
+            { return tagLabel(tag, ifdId); }
+        /*!
           @brief Return the title (label) of the tag.
 
           @param tag The tag
           @param ifdId IFD id
           @return The title (label) of the tag.
          */
-        static const char* tagTitle(uint16_t tag, IfdId ifdId);
+        static const char* tagLabel(uint16_t tag, IfdId ifdId);
         /*!
           @brief Return the description of the tag.
           @param tag The tag
@@ -335,6 +345,7 @@ namespace Exiv2 {
         */
         virtual std::string groupName() const { return ifdItem(); }
         virtual std::string tagName() const;
+        virtual std::string tagLabel() const;
         virtual uint16_t tag() const { return tag_; }
 
         AutoPtr clone() const;

-- 
exiv2 packaging