[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=1bec0ad

The following commit has been merged in the master branch:
commit 1bec0ad25cde626751936f9dc27a441ccd2fcba4
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Wed Jul 16 11:55:44 2008 +0000

    Fixed dangling subIFD tag issue, minor changes.
---
 src/tiffcomposite.cpp |  2 ++
 src/tiffvisitor.cpp   | 11 +++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/tiffcomposite.cpp b/src/tiffcomposite.cpp
index d3462a1..79b9350 100644
--- a/src/tiffcomposite.cpp
+++ b/src/tiffcomposite.cpp
@@ -340,6 +340,8 @@ namespace Exiv2 {
         assert(!tiffPath.empty());
         const TiffStructure* ts = tiffPath.top();
         assert(ts != 0);
+        // Prevent dangling subIFD tags: Do not add a subIFD tag if it has no child
+        if (tiffPath.size() == 1 && ts->newTiffCompFct_ == newTiffSubIfd) return 0;
         TiffComponent* tc = 0;
         // To allow duplicate entries, we only check if the new component already
         // exists if there is still at least one composite tag on the stack
diff --git a/src/tiffvisitor.cpp b/src/tiffvisitor.cpp
index 606bc95..741cc67 100644
--- a/src/tiffvisitor.cpp
+++ b/src/tiffvisitor.cpp
@@ -895,9 +895,9 @@ namespace Exiv2 {
 #ifdef DEBUG
             if (object == 0) {
                 std::cerr << "Warning: addPath() didn't add an entry for "
-                          << tiffGroupId(i->groupName())
+                          << i->groupName()
                           << " tag 0x" << std::setw(4) << std::setfill('0')
-                          << i->tag() << "
";
+                          << std::hex << i->tag() << "
";
             }
 #endif
             if (object != 0) {
@@ -1331,8 +1331,7 @@ namespace Exiv2 {
             std::cerr << "Error: Directory " << tiffGroupName(object->group())
                       << ", entry 0x" << std::setw(4)
                       << std::setfill('0') << std::hex << object->tag()
-                      << " has an invalid type:
"
-                      << "Type = " << std::dec << type
+                      << " has an invalid type " << std::dec << type
                       << "; skipping entry.
";
 #endif
             return;
@@ -1361,7 +1360,7 @@ namespace Exiv2 {
                           << "directory " << tiffGroupName(object->group())
                           << ", entry 0x" << std::setw(4)
                           << std::setfill('0') << std::hex << object->tag()
-                          << " is out of bounds:
"
+                          << " is out of bounds: "
                           << "Offset = 0x" << std::setw(8)
                           << std::setfill('0') << std::hex << offset
                           << "; truncating the entry
";
@@ -1375,7 +1374,7 @@ namespace Exiv2 {
                           << "directory " << tiffGroupName(object->group())
                           << ", entry 0x" << std::setw(4)
                           << std::setfill('0') << std::hex << object->tag()
-                          << " is out of bounds:
"
+                          << " is out of bounds: "
                           << "Offset = 0x" << std::setw(8)
                           << std::setfill('0') << std::hex << offset
                           << ", size = " << std::dec << size

-- 
exiv2 packaging