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

The following commit has been merged in the master branch:
commit 86814157c599730b78adb859510e5871d57a5269
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sun Nov 9 15:11:39 2008 +0000

    Catch unknown makernotes before reading the IFD (digikam bug 174620).
---
 src/makernote.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/makernote.cpp b/src/makernote.cpp
index 80b607a..79402d6 100644
--- a/src/makernote.cpp
+++ b/src/makernote.cpp
@@ -185,8 +185,9 @@ namespace Exiv2 {
     void TiffIfdMakernote::doAccept(TiffVisitor& visitor)
     {
         if (visitor.go(TiffVisitor::geTraverse)) visitor.visitIfdMakernote(this);
-        ifd_.accept(visitor);
-        if (visitor.go(TiffVisitor::geTraverse)) visitor.visitIfdMakernoteEnd(this);
+        if (visitor.go(TiffVisitor::geKnownMakernote)) ifd_.accept(visitor);
+        if (   visitor.go(TiffVisitor::geKnownMakernote)
+            && visitor.go(TiffVisitor::geTraverse)) visitor.visitIfdMakernoteEnd(this);
     }
 
     uint32_t TiffIfdMakernote::doWrite(Blob&     blob,

-- 
exiv2 packaging