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

The following commit has been merged in the master branch:
commit e0fa36074e304e1da3d6270d86ce307f6b31b359
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Fri May 7 11:48:54 2010 +0000

    #668: Fixed obscure issue when copying SubIFDs. (digiKam bug 236127)
---
 src/tiffcomposite.cpp | 2 +-
 src/tiffvisitor.cpp   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/tiffcomposite.cpp b/src/tiffcomposite.cpp
index e08517a..02b122a 100644
--- a/src/tiffcomposite.cpp
+++ b/src/tiffcomposite.cpp
@@ -888,7 +888,7 @@ namespace Exiv2 {
             }
         }
         if (tc == 0) {
-            if (tiffPath.size() == 2 && object.get() != 0) {
+            if (tiffPath.size() == 1 && object.get() != 0) {
                 tc = addChild(object);
             }
             else {
diff --git a/src/tiffvisitor.cpp b/src/tiffvisitor.cpp
index 17128b7..b5aa53f 100644
--- a/src/tiffvisitor.cpp
+++ b/src/tiffvisitor.cpp
@@ -254,7 +254,7 @@ namespace Exiv2 {
 
     void TiffCopier::visitDirectory(TiffDirectory* object)
     {
-        copyObject(object);
+        // Do not copy directories (avoids problems with SubIfds)
     }
 
     void TiffCopier::visitSubIfd(TiffSubIfd* object)

-- 
exiv2 packaging