[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:36:47 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=57a5b8c
The following commit has been merged in the master branch:
commit 57a5b8c4228d477e13153fc2fe8377a2a7f764b7
Author: Andreas Huggel <ahuggel at gmx.net>
Date: Fri Dec 3 16:00:55 2004 +0000
Undid changes from rev 421 (doesn't compile with g++), moved definitions of Exifdatum::op= to exif.cpp
---
src/exif.cpp | 36 +++++++++++++++++++++++++++++
src/exif.hpp | 75 ++++++++++++++++++++++++++----------------------------------
2 files changed, 68 insertions(+), 43 deletions(-)
diff --git a/src/exif.cpp b/src/exif.cpp
index ec544a9..5e4d015 100644
--- a/src/exif.cpp
+++ b/src/exif.cpp
@@ -119,6 +119,42 @@ namespace Exiv2 {
return *this;
} // Exifdatum::operator=
+ Exifdatum& Exifdatum::operator=(const std::string& value)
+ {
+ setValue(value);
+ return *this;
+ }
+
+ Exifdatum& Exifdatum::operator=(const uint16_t& value)
+ {
+ return Exiv2::setValue(*this, value);
+ }
+
+ Exifdatum& Exifdatum::operator=(const uint32_t& value)
+ {
+ return Exiv2::setValue(*this, value);
+ }
+
+ Exifdatum& Exifdatum::operator=(const URational& value)
+ {
+ return Exiv2::setValue(*this, value);
+ }
+
+ Exifdatum& Exifdatum::operator=(const int16_t& value)
+ {
+ return Exiv2::setValue(*this, value);
+ }
+
+ Exifdatum& Exifdatum::operator=(const int32_t& value)
+ {
+ return Exiv2::setValue(*this, value);
+ }
+
+ Exifdatum& Exifdatum::operator=(const Rational& value)
+ {
+ return Exiv2::setValue(*this, value);
+ }
+
void Exifdatum::setValue(const Value* pValue)
{
value_.reset();
diff --git a/src/exif.hpp b/src/exif.hpp
index 1550fbe..f1e6662 100644
--- a/src/exif.hpp
+++ b/src/exif.hpp
@@ -57,37 +57,8 @@ 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
/*!
@@ -128,50 +99,43 @@ namespace Exiv2 {
value, it is replaced with \em value. Otherwise a new
AsciiValue value is created and set to \em value.
*/
- Exifdatum& operator=(const std::string& value)
- { setValue(value); return *this; }
+ Exifdatum& operator=(const std::string& value);
/*!
@brief Assign \em value to the %Exifdatum. If the object already has a
value, it is replaced with \em value. Otherwise a new
UShortValue value is created and set to \em value.
*/
- Exifdatum& operator=(const uint16_t& value)
- { return Exiv2::setValue(*this, value); }
+ Exifdatum& operator=(const uint16_t& value);
/*!
@brief Assign \em value to the %Exifdatum. If the object already has a
value, it is replaced with \em value. Otherwise a new
ULongValue value is created and set to \em value.
*/
- Exifdatum& operator=(const uint32_t& value)
- { return Exiv2::setValue(*this, value); }
+ Exifdatum& operator=(const uint32_t& value);
/*!
@brief Assign \em value to the %Exifdatum. If the object already has a
value, it is replaced with \em value. Otherwise a new
URational value is created and set to \em value.
*/
- Exifdatum& operator=(const URational& value)
- { return Exiv2::setValue(*this, value); }
+ Exifdatum& operator=(const URational& value);
/*!
@brief Assign \em value to the %Exifdatum. If the object already has a
value, it is replaced with \em value. Otherwise a new
ShortValue value is created and set to \em value.
*/
- Exifdatum& operator=(const int16_t& value)
- { return Exiv2::setValue(*this, value); }
+ Exifdatum& operator=(const int16_t& value);
/*!
@brief Assign \em value to the %Exifdatum. If the object already has a
value, it is replaced with \em value. Otherwise a new
LongValue value is created and set to \em value.
*/
- Exifdatum& operator=(const int32_t& value)
- { return Exiv2::setValue(*this, value); }
+ Exifdatum& operator=(const int32_t& value);
/*!
@brief Assign \em value to the %Exifdatum. If the object already has a
value, it is replaced with \em value. Otherwise a new
Rational value is created and set to \em value.
*/
- Exifdatum& operator=(const Rational& value)
- { return Exiv2::setValue(*this, value); }
+ Exifdatum& operator=(const Rational& value);
/*!
@brief Set the value. This method copies (clones) the value pointed
to by \em pValue.
@@ -355,6 +319,17 @@ 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
@@ -918,6 +893,20 @@ 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
More information about the pkg-kde-commits
mailing list