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

The following commit has been merged in the master branch:
commit b1e0189fa223feac6aa17c1dc7c7dc0770a64f86
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sat Jun 11 04:11:23 2005 +0000

    Relaxed checking of Makernote IFD next pointer. Print only a warning if the next pointer is not 0. Fixes bug #431
---
 src/makernote.cpp | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/makernote.cpp b/src/makernote.cpp
index f5a5158..b807917 100644
--- a/src/makernote.cpp
+++ b/src/makernote.cpp
@@ -42,9 +42,7 @@ EXIV2_RCSID("@(#) $Id$");
 #include <string>
 #include <sstream>
 #include <iomanip>
-#if defined DEBUG_MAKERNOTE || defined DEBUG_REGISTRY
-# include <iostream>
-#endif
+#include <iostream>
 #include <cassert>
 
 // *****************************************************************************
@@ -105,10 +103,9 @@ namespace Exiv2 {
         if (rc == 0) {
             // IfdMakerNote currently does not support multiple IFDs
             if (ifd_.next() != 0) {
-#ifdef DEBUG_MAKERNOTE
-                std::cerr << "Makernote IFD has a next pointer != 0 (rc = 3)
";
-#endif
-                rc = 3;
+                std::cerr << "Warning: Makernote IFD has a next pointer != 0 ("
+                          << ifd_.next()
+                          << "). Ignored.
";
             }
         }
 #ifdef DEBUG_MAKERNOTE

-- 
exiv2 packaging