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

The following commit has been merged in the master branch:
commit cdc8c000cf67f4b1b5961481ae763f818542ae9c
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Tue Mar 9 10:11:30 2004 +0000

    Minor changes
---
 src/ifd.cpp       | 6 +++---
 src/makernote.cpp | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/ifd.cpp b/src/ifd.cpp
index 624e2b8..8e1b71d 100644
--- a/src/ifd.cpp
+++ b/src/ifd.cpp
@@ -20,14 +20,14 @@
  */
 /*
   File:      ifd.cpp
-  Version:   $Name:  $ $Revision: 1.8 $
+  Version:   $Name:  $ $Revision: 1.9 $
   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.8 $ $RCSfile: ifd.cpp,v $")
+EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.9 $ $RCSfile: ifd.cpp,v $")
 
 // *****************************************************************************
 // included header files
@@ -409,7 +409,7 @@ namespace Exif {
         for (i = b; i != e; ++i) {
             if (i->size() > 4) {
                 os << "Data of entry " << i - b << ":
";
-                hexdump(os, i->data(), i->size(), i->offset());
+                hexdump(os, i->data(), i->size(), offset_ + i->offset());
             }
         }
 
diff --git a/src/makernote.cpp b/src/makernote.cpp
index f74498a..5ca36ba 100644
--- a/src/makernote.cpp
+++ b/src/makernote.cpp
@@ -20,13 +20,13 @@
  */
 /*
   File:      makernote.cpp
-  Version:   $Name:  $ $Revision: 1.9 $
+  Version:   $Name:  $ $Revision: 1.10 $
   Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
   History:   18-Feb-04, ahu: created
  */
 // *****************************************************************************
 #include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.9 $ $RCSfile: makernote.cpp,v $")
+EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.10 $ $RCSfile: makernote.cpp,v $")
 
 // Define DEBUG_MAKERNOTE to output debug information to std::cerr
 #define DEBUG_MAKERNOTE
@@ -130,7 +130,7 @@ namespace Exif {
             }
         }
 #ifdef DEBUG_MAKERNOTE
-        hexdump(std::cerr, buf, len);
+        hexdump(std::cerr, buf, len, offset);
         if (rc == 0) ifd_.print(std::cerr);
 #endif
         return rc;

-- 
exiv2 packaging