[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=8e1098d

The following commit has been merged in the master branch:
commit 8e1098dad9acd1805d8c252894736c71a7303e4a
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sun Nov 23 14:18:39 2008 +0000

    Removed some warnings.
---
 src/exif.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/exif.cpp b/src/exif.cpp
index 79df27d..3b4094b 100644
--- a/src/exif.cpp
+++ b/src/exif.cpp
@@ -477,7 +477,7 @@ namespace Exiv2 {
         for (unsigned int i = 0; i < EXV_COUNTOF(filteredIfd0Tags); ++i) {
             ExifData::iterator pos = ed.findKey(ExifKey(filteredIfd0Tags[i]));
             if (pos != ed.end()) {
-#ifndef SUPPRESS_WARNINGS
+#ifdef DEBUG
                 std::cerr << "Warning: Exif tag " << pos->key() << " not encoded
";
 #endif
                 ed.erase(pos);
@@ -493,6 +493,9 @@ namespace Exiv2 {
             "Image2"
         };
         for (unsigned int i = 0; i < EXV_COUNTOF(filteredIfds); ++i) {
+#ifdef DEBUG
+            std::cerr << "Warning: Exif IFD " << filteredIfds[i] << " not encoded
";
+#endif
             eraseIfd(ed, filteredIfds[i]);
         }
 
@@ -569,6 +572,9 @@ namespace Exiv2 {
                 break;
             case pttIfd:
                 if (delTags) {
+#ifndef SUPPRESS_WARNINGS
+                    std::cerr << "Warning: Exif IFD " << filteredPvTags[i].key_ << " not encoded
";
+#endif
                     eraseIfd(ed, filteredPvTags[i].key_);
                 }
                 break;
@@ -702,9 +708,6 @@ namespace {
         Exiv2::ExifData::iterator pos;
         for (pos = ed.begin(); pos != ed.end(); ++pos) {
             if (0 == strcmp(pos->ifdItem().c_str(), ifdItem)) {
-#ifndef SUPPRESS_WARNINGS
-                std::cerr << "Warning: Exif IFD " << ifdItem << " not encoded
";
-#endif
                 break;
             }
         }

-- 
exiv2 packaging