[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:42:15 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=484ee13
The following commit has been merged in the master branch:
commit 484ee13325ddcf1ab9eb37561916ad72e496cd61
Author: Andreas Huggel <ahuggel at gmx.net>
Date: Sun Feb 13 13:23:14 2011 +0000
Updated a few DEBUG statements to use groupName().
---
src/tiffcomposite.cpp | 6 +++---
src/tiffimage.cpp | 8 ++++----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/tiffcomposite.cpp b/src/tiffcomposite.cpp
index 6fa893f..42b40e4 100644
--- a/src/tiffcomposite.cpp
+++ b/src/tiffcomposite.cpp
@@ -1294,7 +1294,7 @@ namespace Exiv2 {
// For makernotes, write TIFF image data to the data area
if (group() > mnId) o2 = offset + dataIdx;
#ifdef DEBUG
- std::cerr << "TiffImageEntry, Directory " << ifdItem(group())
+ std::cerr << "TiffImageEntry, Directory " << groupName(group())
<< ", entry 0x" << std::setw(4)
<< std::setfill('0') << std::hex << tag() << std::dec
<< ": Writing offset " << o2 << "
";
@@ -1590,7 +1590,7 @@ namespace Exiv2 {
uint32_t len = pValue()->sizeDataArea();
if (len > 0) {
#ifdef DEBUG
- std::cerr << "TiffImageEntry, Directory " << ifdItem(group())
+ std::cerr << "TiffImageEntry, Directory " << groupName(group())
<< ", entry 0x" << std::setw(4)
<< std::setfill('0') << std::hex << tag() << std::dec
<< ": Writing data area, size = " << len;
@@ -1603,7 +1603,7 @@ namespace Exiv2 {
}
else {
#ifdef DEBUG
- std::cerr << "TiffImageEntry, Directory " << ifdItem(group())
+ std::cerr << "TiffImageEntry, Directory " << groupName(group())
<< ", entry 0x" << std::setw(4)
<< std::setfill('0') << std::hex << tag() << std::dec
<< ": Writing " << strips_.size() << " strips";
diff --git a/src/tiffimage.cpp b/src/tiffimage.cpp
index 66db69f..23dd317 100644
--- a/src/tiffimage.cpp
+++ b/src/tiffimage.cpp
@@ -1731,7 +1731,7 @@ namespace Exiv2 {
}
std::cerr << "extended tag 0x" << std::setw(4) << std::setfill('0')
<< std::hex << std::right << extendedTag
- << ", group " << ifdItem(group) << "
";
+ << ", group " << groupName(group) << "
";
}
#endif
return tc;
@@ -2119,7 +2119,7 @@ namespace Exiv2 {
return false;
}
#ifdef DEBUG
- ExifKey key(tag, ifdItem(group));
+ ExifKey key(tag, groupName(group));
#endif
// If there are primary groups and none matches group, we're done
if ( pPrimaryGroups != 0
@@ -2137,7 +2137,7 @@ namespace Exiv2 {
&& !pPrimaryGroups->empty()
&& group != ifd0Id) {
#ifdef DEBUG
- ExifKey key(tag, ifdItem(group));
+ ExifKey key(tag, groupName(group));
std::cerr << "Image tag: " << key << " (2)
";
#endif
return true;
@@ -2145,7 +2145,7 @@ namespace Exiv2 {
// If tag, group is one of the image tags listed above -> bingo!
if (find(tiffImageTags, TiffImgTagStruct::Key(tag, group))) {
#ifdef DEBUG
- ExifKey key(tag, ifdItem(group));
+ ExifKey key(tag, groupName(group));
std::cerr << "Image tag: " << key << " (3)
";
#endif
return true;
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list