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

The following commit has been merged in the master branch:
commit db98114c3d86091b050c828636db8de0193dba26
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sat Nov 27 15:15:57 2004 +0000

    Changed signature of IptcData::copy() to be consistent with ExifData::copy()
---
 src/iptc.cpp |  5 ++---
 src/iptc.hpp | 12 +++++-------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/iptc.cpp b/src/iptc.cpp
index 2b327a5..f64f428 100644
--- a/src/iptc.cpp
+++ b/src/iptc.cpp
@@ -254,11 +254,10 @@ namespace Exiv2 {
         modified_ = false;
     }
     
-    long IptcData::copy(byte* buf)
+    DataBuf IptcData::copy()
     {
         updateBuffer();
-        memcpy(buf, pData_, size_);
-        return size_;
+        return DataBuf(pData_, size_);
     }
 
     void IptcData::updateBuffer() 
diff --git a/src/iptc.hpp b/src/iptc.hpp
index f52883b..ba8b91d 100644
--- a/src/iptc.hpp
+++ b/src/iptc.hpp
@@ -336,14 +336,12 @@ namespace Exiv2 {
          */
         int writeIptcData(const std::string& path);
         /*!
-          @brief Write the Iptc data to a data buffer, return number of bytes 
-                 written. The copied data follows the IPTC IIM4 standard.
-          @param buf The data buffer to write to.  The user must ensure that the
-                 buffer has enough memory using the %size method. Otherwise
-                 the call results in undefined behaviour.
-          @return Number of characters written to the buffer.
+          @brief Write the Iptc data to a data buffer and return the data buffer.
+                 Caller owns this buffer. The copied data follows the IPTC IIM4
+                 standard.
+          @return Data buffer containing the Iptc data.
          */
-        long copy(byte* buf);
+        DataBuf copy();
         /*!
           @brief Add an %Iptcdatum from the supplied key and value pair. This
                  method copies (clones) the value. A check for non-repeatable

-- 
exiv2 packaging