[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:41:55 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=4928c8d
The following commit has been merged in the master branch:
commit 4928c8d270c49b5199d4e29f872c791e93ab224a
Author: Andreas Huggel <ahuggel at gmx.net>
Date: Sun Aug 29 11:21:59 2010 +0000
Added ExifKey::defaultCount() to access the new count reference information.
---
src/tags.cpp | 6 ++++++
src/tags.hpp | 4 +++-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/tags.cpp b/src/tags.cpp
index 4d610c1..233f607 100644
--- a/src/tags.cpp
+++ b/src/tags.cpp
@@ -2887,6 +2887,12 @@ namespace Exiv2 {
return p_->tagInfo_->typeId_;
}
+ uint16_t ExifKey::defaultCount() const
+ {
+ if (p_->tagInfo_ == 0 || p_->tagInfo_->tag_ == 0xffff) return unknownTag.count_;
+ return p_->tagInfo_->count_;
+ }
+
uint16_t ExifKey::tag() const
{
return p_->tag_;
diff --git a/src/tags.hpp b/src/tags.hpp
index aa7aca4..74707ed 100644
--- a/src/tags.hpp
+++ b/src/tags.hpp
@@ -172,7 +172,7 @@ namespace Exiv2 {
@throw Error if the key cannot be constructed from the tag and IFD
item parameters.
*/
- ExifKey(const TagInfo& tagInfo);
+ explicit ExifKey(const TagInfo& tagInfo);
//! Copy constructor
ExifKey(const ExifKey& rhs);
//! Destructor
@@ -204,6 +204,8 @@ namespace Exiv2 {
std::string tagDesc() const; // Todo: should be in the base class
//! Return the default type id for this tag.
TypeId defaultTypeId() const; // Todo: should be in the base class
+ //! Return the default number of components (not bytes!) this tag has. (0=any, -1=count not known.)
+ uint16_t defaultCount() const;
virtual uint16_t tag() const;
AutoPtr clone() const;
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list