[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=1a2183c

The following commit has been merged in the master branch:
commit 1a2183c2ea909baaf817ae427bf8b50b144646d5
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sun Jul 24 04:09:51 2005 +0000

    This should fix 'unused parameter' warnings reported on Mac OS 10.4.1 Tiger / gcc4. To be confirmed.
---
 src/exif.cpp      | 10 ++++++++++
 src/exif.hpp      |  4 ++--
 src/metadatum.cpp | 22 ++++++++++++++++++++++
 src/metadatum.hpp | 10 +++++-----
 src/value.cpp     |  5 +++++
 src/value.hpp     |  2 +-
 6 files changed, 45 insertions(+), 8 deletions(-)

diff --git a/src/exif.cpp b/src/exif.cpp
index 63a139c..6e01734 100644
--- a/src/exif.cpp
+++ b/src/exif.cpp
@@ -198,6 +198,11 @@ namespace Exiv2 {
         value_->read(value);
     }
 
+    TiffThumbnail& TiffThumbnail::operator=(const TiffThumbnail& /*rhs*/)
+    {
+        return *this; 
+    }
+
     int TiffThumbnail::setDataArea(ExifData& exifData, Ifd* pIfd1,
                                    const byte* buf, long len) const
     {
@@ -282,6 +287,11 @@ namespace Exiv2 {
         return buf;
     }
 
+    JpegThumbnail& JpegThumbnail::operator=(const JpegThumbnail& /*rhs*/) 
+    {
+        return *this; 
+    }
+
     int JpegThumbnail::setDataArea(ExifData& exifData, Ifd* pIfd1,
                                    const byte* buf, long len) const
     {
diff --git a/src/exif.hpp b/src/exif.hpp
index 21a5bb7..b5091b7 100644
--- a/src/exif.hpp
+++ b/src/exif.hpp
@@ -404,7 +404,7 @@ namespace Exiv2 {
         //! @name Manipulators
         //@{
         //! Assignment operator.
-        TiffThumbnail& operator=(const TiffThumbnail& rhs) { return *this; }
+        TiffThumbnail& operator=(const TiffThumbnail& rhs);
         //@}
 
         //! @name Accessors
@@ -429,7 +429,7 @@ namespace Exiv2 {
         //! @name Manipulators
         //@{
         //! Assignment operator.
-        JpegThumbnail& operator=(const JpegThumbnail& rhs) { return *this; }
+        JpegThumbnail& operator=(const JpegThumbnail& rhs);
         //@}
 
         //! @name Accessors
diff --git a/src/metadatum.cpp b/src/metadatum.cpp
index 6e0adbe..493be8b 100644
--- a/src/metadatum.cpp
+++ b/src/metadatum.cpp
@@ -48,6 +48,28 @@ namespace Exiv2 {
         return AutoPtr(clone_());
     }
 
+    Key& Key::operator=(const Key& /*rhs*/) 
+    {
+        return *this; 
+    }
+
+    Metadatum::Metadatum()
+    {
+    }
+
+    Metadatum::Metadatum(const Metadatum& /*rhs*/) 
+    {
+    }
+
+    Metadatum::~Metadatum() 
+    {
+    }
+
+    Metadatum& Metadatum::operator=(const Metadatum& /*rhs*/) 
+    {
+        return *this; 
+    }
+
     std::ostream& operator<<(std::ostream& os, const Metadatum& md)
     {
         os << "0x" << std::setw(4) << std::setfill('0') << std::right
diff --git a/src/metadatum.hpp b/src/metadatum.hpp
index 582c927..6811ffb 100644
--- a/src/metadatum.hpp
+++ b/src/metadatum.hpp
@@ -103,7 +103,7 @@ namespace Exiv2 {
           @brief Assignment operator. Protected so that it can only be used
                  by subclasses but not directly.
          */
-        Key& operator=(const Key& rhs) { return *this; }
+        Key& operator=(const Key& rhs);
         //@}
 
     private:
@@ -127,11 +127,11 @@ namespace Exiv2 {
         //! @name Creators
         //@{
         //! Default Constructor
-        Metadatum() {}
+        Metadatum();
         //! Copy constructor
-        Metadatum(const Metadatum& rhs) {}
+        Metadatum(const Metadatum& rhs);
         //! Destructor
-        virtual ~Metadatum() {}
+        virtual ~Metadatum();
         //@}
 
         //! @name Manipulators
@@ -250,7 +250,7 @@ namespace Exiv2 {
           @brief Assignment operator. Protected so that it can only be used
                  by subclasses but not directly.
          */
-        Metadatum& operator=(const Metadatum& rhs) { return *this; }
+        Metadatum& operator=(const Metadatum& rhs);
         //@}
 
     }; // class Metadatum
diff --git a/src/value.cpp b/src/value.cpp
index be1b142..fbaf95b 100644
--- a/src/value.cpp
+++ b/src/value.cpp
@@ -110,6 +110,11 @@ namespace Exiv2 {
         return value;
     } // Value::create
 
+    int Value::setDataArea(const byte* /*buf*/, long /*len*/) 
+    {
+        return -1; 
+    }
+
     std::string Value::toString() const
     {
         std::ostringstream os;
diff --git a/src/value.hpp b/src/value.hpp
index 7e40e03..7764a9b 100644
--- a/src/value.hpp
+++ b/src/value.hpp
@@ -106,7 +106,7 @@ namespace Exiv2 {
           @param len Size of the data area
           @return Return -1 if the value has no data area, else 0.
          */
-        virtual int setDataArea(const byte* buf, long len) { return -1; }
+        virtual int setDataArea(const byte* buf, long len);
         //@}
 
         //! @name Accessors

-- 
exiv2 packaging