[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=b8d802c

The following commit has been merged in the master branch:
commit b8d802c12c78bf46a6e2ef528ce3885d0e36ee9e
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Thu Mar 4 13:34:54 2010 +0000

    #684: Quickfix to prevent the assertion failure.
---
 src/tiffvisitor.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/tiffvisitor.cpp b/src/tiffvisitor.cpp
index 199ad43..cb58963 100644
--- a/src/tiffvisitor.cpp
+++ b/src/tiffvisitor.cpp
@@ -1250,6 +1250,17 @@ namespace Exiv2 {
 #endif
                     return;
                 }
+                // Todo: Don't use a hardcoded constant here
+                if (i == 4) {
+#ifndef SUPPRESS_WARNINGS
+                    std::cerr << "Warning: "
+                              << "Directory " << tiffGroupName(object->group())
+                              << ", entry 0x" << std::setw(4)
+                              << std::setfill('0') << std::hex << object->tag()
+                              << ": Skipping sub-IFDs beyond the first four.
";
+#endif
+                    break;
+                }
                 // If there are multiple dirs, group is incremented for each
                 TiffComponent::AutoPtr td(new TiffDirectory(object->tag(),
                                                             object->newGroup_ + i));

-- 
exiv2 packaging