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

The following commit has been merged in the master branch:
commit dbc1e60135294c2ed75ed39bbf0fcab4b39f7eb6
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sat Aug 7 16:36:15 2010 +0000

    Re-added generalized ValueType constructors.
---
 src/value.hpp | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/value.hpp b/src/value.hpp
index 6867096..70edea7 100644
--- a/src/value.hpp
+++ b/src/value.hpp
@@ -1230,10 +1230,12 @@ namespace Exiv2 {
 
         //! @name Creators
         //@{
-        //! Default constructor.
-        ValueType();
+        //! Default Constructor.
+        explicit ValueType(TypeId typeId =getType<T>());
+        //! Constructor.
+        ValueType(const byte* buf, long len, ByteOrder byteOrder, TypeId typeId =getType<T>());
         //! Constructor.
-        explicit ValueType(TypeId typeId);
+        explicit ValueType(const T& val, TypeId typeId =getType<T>());
         //! Copy constructor
         ValueType(const ValueType<T>& rhs);
         //! Virtual destructor.
@@ -1480,15 +1482,23 @@ namespace Exiv2 {
     }
 
     template<typename T>
-    ValueType<T>::ValueType()
-        : Value(getType<T>()), pDataArea_(0), sizeDataArea_(0)
+    ValueType<T>::ValueType(TypeId typeId)
+        : Value(typeId), pDataArea_(0), sizeDataArea_(0)
     {
     }
 
     template<typename T>
-    ValueType<T>::ValueType(TypeId typeId)
+    ValueType<T>::ValueType(const byte* buf, long len, ByteOrder byteOrder, TypeId typeId)
+        : Value(typeId), pDataArea_(0), sizeDataArea_(0)
+    {
+        read(buf, len, byteOrder);
+    }
+
+    template<typename T>
+    ValueType<T>::ValueType(const T& val, TypeId typeId)
         : Value(typeId), pDataArea_(0), sizeDataArea_(0)
     {
+        value_.push_back(val);
     }
 
     template<typename T>

-- 
exiv2 packaging