[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

Maximiliano Curia maxy at moszumanska.debian.org
Thu Jul 13 17:36:33 UTC 2017


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=62de167

The following commit has been merged in the master branch:
commit 62de167ce7e85e0d8f95282e0426587d7dcdd3d2
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sun Aug 1 15:34:24 2004 +0000

    Fixed DataValue read() and write()
---
 src/value.cpp | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/value.cpp b/src/value.cpp
index 40994f9..59eafc5 100644
--- a/src/value.cpp
+++ b/src/value.cpp
@@ -20,14 +20,14 @@
  */
 /*
   File:      value.cpp
-  Version:   $Name:  $ $Revision: 1.9 $
+  Version:   $Name:  $ $Revision: 1.10 $
   Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
   History:   26-Jan-04, ahu: created
              11-Feb-04, ahu: isolated as a component
  */
 // *****************************************************************************
 #include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.9 $ $RCSfile: value.cpp,v $")
+EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.10 $ $RCSfile: value.cpp,v $")
 
 // *****************************************************************************
 // included header files
@@ -110,13 +110,18 @@ namespace Exiv2 {
 
     void DataValue::read(const byte* buf, long len, ByteOrder byteOrder)
     {
-        // byteOrder not needed 
-        value_.assign( len, *buf );
+        // byteOrder not needed
+        value_.assign(buf, buf + len);
     }
 
     void DataValue::read(const std::string& buf)
     {
-        value_.assign( buf.size(), *buf.data() );
+        std::istringstream is(buf);
+        int tmp;
+        value_.clear();
+        while (is >> tmp) {
+            value_.push_back(static_cast<char>(tmp));
+        }
     }
 
     long DataValue::copy(byte* buf, ByteOrder byteOrder) const

-- 
exiv2 packaging



More information about the pkg-kde-commits mailing list