[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:35:57 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=7dcf194
The following commit has been merged in the master branch:
commit 7dcf1945015df0df0e4928df03a70c1346cdd413
Author: Andreas Huggel <ahuggel at gmx.net>
Date: Sun Jan 25 17:05:55 2004 +0000
Removed Metadatum default constructor, fixed doc
---
src/exif.cpp | 7 +------
src/exif.hpp | 8 +++-----
2 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/src/exif.cpp b/src/exif.cpp
index a558605..663a7d3 100644
--- a/src/exif.cpp
+++ b/src/exif.cpp
@@ -25,7 +25,7 @@
RCS information
$Name: $
- $Revision: 1.7 $
+ $Revision: 1.8 $
*/
// *****************************************************************************
// included header files
@@ -294,11 +294,6 @@ namespace Exif {
return os << value_;
}
- Metadatum::Metadatum()
- : tag_(0), ifdId_(IfdIdNotSet), ifdIdx_(-1), value_(0)
- {
- }
-
Metadatum::Metadatum(uint16 tag, uint16 type,
IfdId ifdId, int ifdIdx, Value* value)
: tag_(tag), ifdId_(ifdId), ifdIdx_(ifdIdx), value_(value)
diff --git a/src/exif.hpp b/src/exif.hpp
index 0043517..bbad7fc 100644
--- a/src/exif.hpp
+++ b/src/exif.hpp
@@ -21,7 +21,7 @@
/*!
@file exif.hpp
@brief Encoding and decoding of %Exif data
- @version $Name: $ $Revision: 1.8 $
+ @version $Name: $ $Revision: 1.9 $
@author Andreas Huggel (ahu)
<a href="mailto:ahuggel at gmx.net">ahuggel at gmx.net</a>
@date 09-Jan-03, ahu: created
@@ -390,8 +390,6 @@ namespace Exif {
*/
class Metadatum {
public:
- //! Default Constructor
- Metadatum();
/*!
@brief Constructor for tag data read from an IFD, when all
information is available. The Metadatum takes ownership
@@ -406,7 +404,7 @@ namespace Exif {
We'll figure out the details for it.
*/
// Todo: implement me!
- Metadatum(const std::string& key, Value* value =0);
+ explicit Metadatum(const std::string& key, Value* value =0);
//! Destructor
~Metadatum();
//! Copy constructor
@@ -705,7 +703,7 @@ namespace Exif {
const_iterator begin() const { return metadata_.begin(); }
//! End of the metadata
const_iterator end() const { return metadata_.end(); }
-
+ //! Find a metadatum by its key, return a const iterator to it
const_iterator findKey(const std::string& key) const;
//! Write the thumbnail image to a file
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list