[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:39:47 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=667d10e
The following commit has been merged in the master branch:
commit 667d10ef93734d4070d8424c03e1e4b18a62f23c
Author: Andreas Huggel <ahuggel at gmx.net>
Date: Wed Sep 17 15:25:11 2008 +0000
Removed inline functions from class hierarchies (Patrick Spendrin).
---
src/datasets.cpp | 4 ++++
src/datasets.hpp | 2 ++
src/metadatum.cpp | 4 ++++
src/metadatum.hpp | 2 +-
src/value.cpp | 19 +++++++++++++++++++
src/value.hpp | 9 ++++-----
6 files changed, 34 insertions(+), 6 deletions(-)
diff --git a/src/datasets.cpp b/src/datasets.cpp
index d8cafb4..8cb09fe 100644
--- a/src/datasets.cpp
+++ b/src/datasets.cpp
@@ -608,6 +608,10 @@ namespace Exiv2 {
{
}
+ IptcKey::~IptcKey()
+ {
+ }
+
IptcKey& IptcKey::operator=(const IptcKey& rhs)
{
if (this == &rhs) return *this;
diff --git a/src/datasets.hpp b/src/datasets.hpp
index 0730a1c..7bd9e29 100644
--- a/src/datasets.hpp
+++ b/src/datasets.hpp
@@ -298,6 +298,8 @@ namespace Exiv2 {
IptcKey(uint16_t tag, uint16_t record);
//! Copy constructor
IptcKey(const IptcKey& rhs);
+ //! Destructor
+ virtual ~IptcKey();
//@}
//! @name Manipulators
diff --git a/src/metadatum.cpp b/src/metadatum.cpp
index b0e070d..ed68a85 100644
--- a/src/metadatum.cpp
+++ b/src/metadatum.cpp
@@ -43,6 +43,10 @@ EXIV2_RCSID("@(#) $Id$")
// class member definitions
namespace Exiv2 {
+ Key::~Key()
+ {
+ }
+
Key::AutoPtr Key::clone() const
{
return AutoPtr(clone_());
diff --git a/src/metadatum.hpp b/src/metadatum.hpp
index c55b4a5..6b46c6a 100644
--- a/src/metadatum.hpp
+++ b/src/metadatum.hpp
@@ -61,7 +61,7 @@ namespace Exiv2 {
//! @name Creators
//@{
//! Destructor
- virtual ~Key() {}
+ virtual ~Key();
//@}
//! @name Accessors
diff --git a/src/value.cpp b/src/value.cpp
index 043b491..c54d667 100644
--- a/src/value.cpp
+++ b/src/value.cpp
@@ -55,6 +55,10 @@ namespace Exiv2 {
{
}
+ Value::~Value()
+ {
+ }
+
Value& Value::operator=(const Value& rhs)
{
if (this == &rhs) return *this;
@@ -146,6 +150,21 @@ namespace Exiv2 {
return toString();
}
+ DataValue::DataValue(TypeId typeId) : Value(typeId)
+ {
+ }
+
+ DataValue::DataValue(const byte* buf,
+ long len, ByteOrder byteOrder,TypeId typeId)
+ : Value(typeId)
+ {
+ read(buf, len, byteOrder);
+ }
+
+ DataValue::~DataValue()
+ {
+ }
+
int DataValue::read(const byte* buf, long len, ByteOrder /*byteOrder*/)
{
// byteOrder not needed
diff --git a/src/value.hpp b/src/value.hpp
index 8c76227..2c470f1 100644
--- a/src/value.hpp
+++ b/src/value.hpp
@@ -69,7 +69,7 @@ namespace Exiv2 {
//! Constructor, taking a type id to initialize the base class with
explicit Value(TypeId typeId);
//! Virtual destructor.
- virtual ~Value() {}
+ virtual ~Value();
//@}
//! @name Manipulators
//@{
@@ -268,14 +268,13 @@ namespace Exiv2 {
//! @name Creators
//@{
//! Default constructor.
- explicit DataValue(TypeId typeId =undefined) : Value(typeId) {}
+ explicit DataValue(TypeId typeId =undefined);
//! Constructor
DataValue(const byte* buf,
long len, ByteOrder byteOrder =invalidByteOrder,
- TypeId typeId =undefined)
- : Value(typeId) { read(buf, len, byteOrder); }
+ TypeId typeId =undefined);
//! Virtual destructor.
- virtual ~DataValue() {}
+ virtual ~DataValue();
//@}
//! @name Manipulators
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list