fixed build break on msvc.net

v0.27.3
brad 21 years ago
parent c6025cdd2a
commit de111e8b8f

@ -57,6 +57,35 @@ namespace Exiv2 {
// class declarations // class declarations
class ExifData; class ExifData;
class MakerNote; 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 // class definitions
@ -325,17 +354,6 @@ namespace Exiv2 {
*/ */
std::ostream& operator<<(std::ostream& os, const Exifdatum& md); 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 @brief Exif %Thumbnail image. This abstract base class provides the
interface for the thumbnail image that is optionally embedded in interface for the thumbnail image that is optionally embedded in
@ -900,20 +918,6 @@ namespace Exiv2 {
// ***************************************************************************** // *****************************************************************************
// template, inline and free functions // 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 @brief Add all metadata in the range from iterator position begin to
iterator position end, which have an IFD id matching that of the iterator position end, which have an IFD id matching that of the

Loading…
Cancel
Save