[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=238ab13

The following commit has been merged in the master branch:
commit 238ab136ae9fecc582e1cc2543ed489d85bcf787
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sat Aug 7 11:19:51 2010 +0000

    #717: Retain TIFF IFD type when writing, removed unnecessary ValueType constructors.
---
 src/value.cpp |  2 +-
 src/value.hpp | 18 ++++--------------
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/src/value.cpp b/src/value.cpp
index 7b30ad7..5f5d6c9 100644
--- a/src/value.cpp
+++ b/src/value.cpp
@@ -86,7 +86,7 @@ namespace Exiv2 {
             break;
         case unsignedLong:
         case tiffIfd:
-            value = AutoPtr(new ValueType<uint32_t>);
+            value = AutoPtr(new ValueType<uint32_t>(typeId));
             break;
         case unsignedRational:
             value = AutoPtr(new ValueType<URational>);
diff --git a/src/value.hpp b/src/value.hpp
index 0b7fe3b..e5ca74a 100644
--- a/src/value.hpp
+++ b/src/value.hpp
@@ -1232,10 +1232,8 @@ namespace Exiv2 {
         //@{
         //! Default constructor.
         ValueType();
-        //! Constructor
-        ValueType(const byte* buf, long len, ByteOrder byteOrder);
-        //! Constructor (Note: Argument \em byteOrder is ignored and deprecated)
-        explicit ValueType(const T& val, ByteOrder byteOrder =littleEndian);
+        //! Constructor.
+        ValueType(TypeId typeId);
         //! Copy constructor
         ValueType(const ValueType<T>& rhs);
         //! Virtual destructor.
@@ -1488,17 +1486,9 @@ namespace Exiv2 {
     }
 
     template<typename T>
-    ValueType<T>::ValueType(const byte* buf, long len, ByteOrder byteOrder)
-        : Value(getType<T>()), pDataArea_(0), sizeDataArea_(0)
-    {
-        read(buf, len, byteOrder);
-    }
-
-    template<typename T>
-    ValueType<T>::ValueType(const T& val, ByteOrder /*byteOrder*/)
-        : Value(getType<T>()), pDataArea_(0), sizeDataArea_(0)
+    ValueType<T>::ValueType(TypeId typeId)
+        : Value(typeId), pDataArea_(0), sizeDataArea_(0)
     {
-        value_.push_back(val);
     }
 
     template<typename T>

-- 
exiv2 packaging