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

The following commit has been merged in the master branch:
commit de111e8b8fe0b4dd6ba3bb2d7bf1f9befb49dccd
Author: brad <chickb at gmail.com>
Date:   Fri Dec 3 00:10:50 2004 +0000

    fixed build break on msvc.net
---
 src/exif.hpp | 54 +++++++++++++++++++++++++++++-------------------------
 1 file changed, 29 insertions(+), 25 deletions(-)

diff --git a/src/exif.hpp b/src/exif.hpp
index 9e36a95..1550fbe 100644
--- a/src/exif.hpp
+++ b/src/exif.hpp
@@ -57,8 +57,37 @@ namespace Exiv2 {
 // class declarations
     class ExifData;
     class MakerNote;
+    class Exifdatum;
 
 // *****************************************************************************
+// template (definition needed before template use in msvc.net)
+    
+    /*!
+      @brief Set the value of \em exifDatum to \em value. If the object already
+             has a value, it is replaced. Otherwise a new ValueType\<T\> value
+             is created and set to \em value. 
+
+      This is a helper function, called from Exifdatum members. It is meant to
+      be used with T = (u)int16_t, (u)int32_t or (U)Rational. Do not use directly.
+    */
+    template<typename T>
+    Exifdatum& setValue(Exifdatum& exifDatum, const T& value)
+    {
+        if (exifDatum.value_.get() == 0) {
+            std::auto_ptr<ValueType<T> > v 
+                = std::auto_ptr<ValueType<T> >(new ValueType<T>);
+            v->value_.push_back(value);
+            exifDatum.value_ = v;
+        }
+        else {
+            exifDatum.value_->read(Exiv2::toString(value));
+        }
+        return exifDatum;
+    }
+
+    
+    
+// *****************************************************************************
 // class definitions
 
     /*!
@@ -326,17 +355,6 @@ namespace Exiv2 {
     std::ostream& operator<<(std::ostream& os, const Exifdatum& md);
 
     /*!
-      @brief Set the value of \em exifDatum to \em value. If the object already
-             has a value, it is replaced. Otherwise a new ValueType\<T\> value
-             is created and set to \em value. 
-
-      This is a helper function, called from Exifdatum members. It is meant to
-      be used with T = (u)int16_t, (u)int32_t or (U)Rational. Do not use directly.
-    */
-    template<typename T>
-    Exifdatum& setValue(Exifdatum& exifDatum, const T& value);
-
-    /*!
       @brief Exif %Thumbnail image. This abstract base class provides the
              interface for the thumbnail image that is optionally embedded in
              the Exif data. This class is used internally by ExifData, it is
@@ -900,20 +918,6 @@ namespace Exiv2 {
 // *****************************************************************************
 // template, inline and free functions
     
-    template<typename T>
-    Exifdatum& setValue(Exifdatum& exifDatum, const T& value)
-    {
-        if (exifDatum.value_.get() == 0) {
-            std::auto_ptr<ValueType<T> > v 
-                = std::auto_ptr<ValueType<T> >(new ValueType<T>);
-            v->value_.push_back(value);
-            exifDatum.value_ = v;
-        }
-        else {
-            exifDatum.value_->read(Exiv2::toString(value));
-        }
-        return exifDatum;
-    }
     /*!
       @brief Add all metadata in the range from iterator position begin to
              iterator position end, which have an IFD id matching that of the

-- 
exiv2 packaging