third_party/exiv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed build break on msvc.net

Browse Source
This commit is contained in:
brad 2004-12-03 00:10:50 +00:00
parent c6025cdd2a
commit de111e8b8f
1 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/exif.hpp
View File

@ -57,7 +57,36 @@ 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
@ -325,17 +354,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
@ -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