[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=ba89716

The following commit has been merged in the master branch:
commit ba89716cd6d6bf260ec46f9a1fdf70f6e5278c18
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Tue Nov 21 16:22:56 2006 +0000

    Added methods to access built-in read-only IPTC datasets
---
 src/datasets.cpp | 10 ++++++++++
 src/datasets.hpp |  4 ++++
 2 files changed, 14 insertions(+)

diff --git a/src/datasets.cpp b/src/datasets.cpp
index 1e5eb9a..a8575d6 100644
--- a/src/datasets.cpp
+++ b/src/datasets.cpp
@@ -160,6 +160,11 @@ namespace Exiv2 {
                 "(Invalid)", false, false, 0, 0, Exiv2::unsignedShort, IptcDataSets::envelope, "")
     };
 
+    const DataSet* IptcDataSets::envelopeRecordList()
+    {
+        return envelopeRecord;
+    }
+
     static const DataSet application2Record[] = {
         DataSet(IptcDataSets::RecordVersion, "RecordVersion", "RecordVersion", 
                 "A binary number identifying the version of the Information "
@@ -410,6 +415,11 @@ namespace Exiv2 {
                 "(Invalid)", false, false, 0, 0, Exiv2::unsignedShort, IptcDataSets::application2, "")
     };
 
+    const DataSet* IptcDataSets::application2RecordList()
+    {
+        return application2Record;
+    }
+
     static const DataSet unknownDataSet(0xffff, "Unknown dataset", "Unknown dataset", "Unknown dataset", false, true, 0, 0xffffffff, Exiv2::string, IptcDataSets::invalidRecord, "Unknown dataset");
 
     // Dataset lookup lists.This is an array with pointers to one list per IIM4 Record.
diff --git a/src/datasets.hpp b/src/datasets.hpp
index 41c9309..8796e5b 100644
--- a/src/datasets.hpp
+++ b/src/datasets.hpp
@@ -255,6 +255,10 @@ namespace Exiv2 {
            @throw Error if the record is not known;
          */
         static uint16_t recordId(const std::string& recordName);
+        //! Return read-only list of built-in Envelope Record datasets
+        static const DataSet* envelopeRecordList();
+        //! Return read-only list of built-in Application2 Record datasets
+        static const DataSet* application2RecordList();
         //! Print a list of all dataSets to output stream
         static void dataSetList(std::ostream& os);
 

-- 
exiv2 packaging