[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=2f9686e

The following commit has been merged in the master branch:
commit 2f9686e3d31b1e82dc13d14a210c370dfbbb67a9
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Thu Oct 30 11:27:36 2008 +0000

    Removed seemingly unneeded EXIV2APIs.
---
 src/datasets.hpp | 2 +-
 src/image.hpp    | 2 +-
 src/iptc.hpp     | 2 +-
 src/tags.hpp     | 2 +-
 src/value.hpp    | 4 ++--
 src/xmp.hpp      | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/datasets.hpp b/src/datasets.hpp
index 13c5d80..7bd9e29 100644
--- a/src/datasets.hpp
+++ b/src/datasets.hpp
@@ -277,7 +277,7 @@ namespace Exiv2 {
     class EXIV2API IptcKey : public Key {
     public:
         //! Shortcut for an %IptcKey auto pointer.
-        typedef std::auto_ptr<EXIV2API IptcKey> AutoPtr;
+        typedef std::auto_ptr<IptcKey> AutoPtr;
 
         //! @name Creators
         //@{
diff --git a/src/image.hpp b/src/image.hpp
index 97624e7..82440be 100644
--- a/src/image.hpp
+++ b/src/image.hpp
@@ -71,7 +71,7 @@ namespace Exiv2 {
     class EXIV2API Image {
     public:
         //! Image auto_ptr type
-        typedef std::auto_ptr<EXIV2API Image> AutoPtr;
+        typedef std::auto_ptr<Image> AutoPtr;
 
         //! @name Creators
         //@{
diff --git a/src/iptc.hpp b/src/iptc.hpp
index 7137f56..2b0989a 100644
--- a/src/iptc.hpp
+++ b/src/iptc.hpp
@@ -175,7 +175,7 @@ namespace Exiv2 {
     }; // class Iptcdatum
 
     //! Container type to hold all metadata
-    typedef std::vector<EXIV2API Iptcdatum> IptcMetadata;
+    typedef std::vector<Iptcdatum> IptcMetadata;
 
     //! Unary predicate that matches an Iptcdatum with given record and dataset
     class EXIV2API FindMetadatumById {
diff --git a/src/tags.hpp b/src/tags.hpp
index 4d94659..01d2b4d 100644
--- a/src/tags.hpp
+++ b/src/tags.hpp
@@ -328,7 +328,7 @@ namespace Exiv2 {
     class EXIV2API ExifKey : public Key {
     public:
         //! Shortcut for an %ExifKey auto pointer.
-        typedef std::auto_ptr<EXIV2API ExifKey> AutoPtr;
+        typedef std::auto_ptr<ExifKey> AutoPtr;
 
         //! @name Creators
         //@{
diff --git a/src/value.hpp b/src/value.hpp
index 7ddc601..ffee125 100644
--- a/src/value.hpp
+++ b/src/value.hpp
@@ -336,7 +336,7 @@ namespace Exiv2 {
 
     public:
         //! Type used to store the data.
-        typedef std::vector<EXIV2API byte> ValueType;
+        typedef std::vector<byte> ValueType;
         // DATA
         ValueType value_;                       //!< Stores the data value
 
@@ -842,7 +842,7 @@ namespace Exiv2 {
 
     public:
         //! Type used to store XMP array elements.
-        typedef std::vector<EXIV2API std::string> ValueType;
+        typedef std::vector<std::string> ValueType;
         // DATA
         std::vector<std::string> value_;        //!< Stores the string values.
 
diff --git a/src/xmp.hpp b/src/xmp.hpp
index 16cb6a1..fc3b63f 100644
--- a/src/xmp.hpp
+++ b/src/xmp.hpp
@@ -163,7 +163,7 @@ namespace Exiv2 {
     }; // class Xmpdatum
 
     //! Container type to hold all metadata
-    typedef std::vector<EXIV2API Xmpdatum> XmpMetadata;
+    typedef std::vector<Xmpdatum> XmpMetadata;
 
     /*!
       @brief A container for XMP data. This is a top-level class of

-- 
exiv2 packaging