[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:37 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=d79bc27
The following commit has been merged in the master branch:
commit d79bc27e81539acb580061808cf7df3f471f3662
Author: Andreas Huggel <ahuggel at gmx.net>
Date: Fri Jul 4 11:57:50 2008 +0000
Fixed "priority keys" issue highlighted by Udi Fuchs.
---
src/tiffvisitor.cpp | 8 ++------
src/tiffvisitor_int.hpp | 6 ++++++
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/tiffvisitor.cpp b/src/tiffvisitor.cpp
index 502c40d..96711c2 100644
--- a/src/tiffvisitor.cpp
+++ b/src/tiffvisitor.cpp
@@ -52,7 +52,6 @@ EXIV2_RCSID("@(#) $Id$")
#include <iostream>
#include <iomanip>
#include <cassert>
-#include <set>
// *****************************************************************************
// class member definitions
@@ -375,10 +374,7 @@ namespace Exiv2 {
void TiffDecoder::setExifTag(const ExifKey& key, const Value* pValue, Prio prio)
{
- typedef std::set<std::string> PriorityKeys;
- static PriorityKeys priorityKeys;
-
- bool isRegPrioTag = (priorityKeys.find(key.key()) != priorityKeys.end());
+ bool isRegPrioTag = (priorityKeys_.find(key.key()) != priorityKeys_.end());
switch (prio) {
case pvNormal:
@@ -388,7 +384,7 @@ namespace Exiv2 {
case pvHigh:
// Register the key as a high prio tag, erase low prio tags, add this
if (!isRegPrioTag) {
- priorityKeys.insert(key.key());
+ priorityKeys_.insert(key.key());
ExifData::iterator pos = exifData_.findKey(key);
while (pos != exifData_.end()) {
exifData_.erase(pos);
diff --git a/src/tiffvisitor_int.hpp b/src/tiffvisitor_int.hpp
index 20ba36c..e256fea 100644
--- a/src/tiffvisitor_int.hpp
+++ b/src/tiffvisitor_int.hpp
@@ -42,6 +42,7 @@
#include <iomanip>
#include <cassert>
#include <map>
+#include <set>
// *****************************************************************************
// namespace extensions
@@ -307,6 +308,11 @@ namespace Exiv2 {
GroupType groupType_; //!< NewSubfileType for each group
bool decodedIptc_; //!< Indicates if IPTC has been decoded yet
+
+ //! Type used as the container for "priority keys"
+ typedef std::set<std::string> PriorityKeys;
+ PriorityKeys priorityKeys_; //!< Priority keys
+
}; // class TiffDecoder
/*!
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list