[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=44cdf21

The following commit has been merged in the master branch:
commit 44cdf21cdd27e7dd00bf0a88371d2608d524b2e2
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Tue Mar 9 09:58:37 2004 +0000

    Added optional offset arg to hexdump
---
 src/ifd.cpp   |  6 +++---
 src/types.cpp |  8 ++++----
 src/types.hpp | 10 +++++++---
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/ifd.cpp b/src/ifd.cpp
index 9d7fe89..624e2b8 100644
--- a/src/ifd.cpp
+++ b/src/ifd.cpp
@@ -20,14 +20,14 @@
  */
 /*
   File:      ifd.cpp
-  Version:   $Name:  $ $Revision: 1.7 $
+  Version:   $Name:  $ $Revision: 1.8 $
   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.7 $ $RCSfile: ifd.cpp,v $")
+EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.8 $ $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());
+                hexdump(os, i->data(), i->size(), i->offset());
             }
         }
 
diff --git a/src/types.cpp b/src/types.cpp
index 71b00c0..ddf50af 100644
--- a/src/types.cpp
+++ b/src/types.cpp
@@ -20,14 +20,14 @@
  */
 /*
   File:      types.cpp
-  Version:   $Name:  $ $Revision: 1.3 $
+  Version:   $Name:  $ $Revision: 1.4 $
   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.3 $ $RCSfile: types.cpp,v $")
+EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.4 $ $RCSfile: types.cpp,v $")
 
 // *****************************************************************************
 // included header files
@@ -209,7 +209,7 @@ namespace Exif {
         return o;
     }
 
-    void hexdump(std::ostream& os, const char* buf, long len)
+    void hexdump(std::ostream& os, const char* buf, long len, long offset)
     {
         const std::string::size_type pos = 8 + 16 * 3 + 2; 
         const std::string align(pos, ' '); 
@@ -218,7 +218,7 @@ namespace Exif {
         while (i < len) {
             os << "  " 
                << std::setw(4) << std::setfill('0') << std::hex 
-               << i << "  ";
+               << i + offset << "  ";
             std::ostringstream ss;
             do {
                 unsigned char c = buf[i];
diff --git a/src/types.hpp b/src/types.hpp
index 28a5a71..51e19ad 100644
--- a/src/types.hpp
+++ b/src/types.hpp
@@ -21,7 +21,7 @@
 /*!
   @file    types.hpp
   @brief   Type definitions for Exiv2 and related functionality
-  @version $Name:  $ $Revision: 1.5 $
+  @version $Name:  $ $Revision: 1.6 $
   @author  Andreas Huggel (ahu)
            <a href="mailto:ahuggel at gmx.net">ahuggel at gmx.net</a>
   @date    09-Jan-04, ahu: created
@@ -160,8 +160,12 @@ namespace Exif {
      */
     long r2Data(char* buf, Rational l, ByteOrder byteOrder);
 
-    //! Print len bytes from buf in hex and ASCII format to the given stream
-    void hexdump(std::ostream& os, const char* buf, long len);
+    /*!
+      @brief Print len bytes from buf in hex and ASCII format to the given
+             stream, prefixed with the position in the buffer adjusted by
+             offset.
+     */
+    void hexdump(std::ostream& os, const char* buf, long len, long offset =0);
    
 // *****************************************************************************
 // template and inline definitions

-- 
exiv2 packaging