[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=5c43555

The following commit has been merged in the master branch:
commit 5c435558563b2390265d4edcbc299b0d6ec5614e
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Wed Jun 2 05:15:38 2004 +0000

    Corrected IFD entry in debug output
---
 src/ifd.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/ifd.cpp b/src/ifd.cpp
index e331f63..cad2971 100644
--- a/src/ifd.cpp
+++ b/src/ifd.cpp
@@ -20,14 +20,14 @@
  */
 /*
   File:      ifd.cpp
-  Version:   $Name:  $ $Revision: 1.20 $
+  Version:   $Name:  $ $Revision: 1.21 $
   Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
   History:   26-Jan-04, ahu: created
              11-Feb-04, ahu: isolated as a component
  */
 // *****************************************************************************
 #include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.20 $ $RCSfile: ifd.cpp,v $")
+EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.21 $ $RCSfile: ifd.cpp,v $")
 
 // *****************************************************************************
 // included header files
@@ -213,7 +213,7 @@ namespace Exiv2 {
                 if (len < o + 12) {
                     // Todo: How to handle debug output like this
                     std::cerr << "Error: " << ExifTags::ifdName(ifdId_) 
-                              << " entry " << i + 1
+                              << " entry " << i
                               << " lies outside of the IFD memory buffer.
";
                     rc = 6;
                     break;
@@ -300,7 +300,7 @@ namespace Exiv2 {
                     // Todo: How to handle debug output like this
                     std::cerr << "Warning: Upper boundary of data for " 
                               << ExifTags::ifdName(ifdId_) 
-                              << " entry " << i - begin + 1 
+                              << " entry " << i - begin 
                               << " is out of bounds:
"
                               << " Offset = " << tmpOffset
                               << ", size = " << i->size_ 

-- 
exiv2 packaging