[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=80005ff

The following commit has been merged in the master branch:
commit 80005ff6d6b71bc4b9ff574d17920915b1a64349
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Fri Mar 19 04:41:04 2004 +0000

    Added Entry::component
---
 src/ifd.cpp | 10 ++++++++--
 src/ifd.hpp |  7 ++++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/ifd.cpp b/src/ifd.cpp
index 8e1b71d..e13cebe 100644
--- a/src/ifd.cpp
+++ b/src/ifd.cpp
@@ -20,14 +20,14 @@
  */
 /*
   File:      ifd.cpp
-  Version:   $Name:  $ $Revision: 1.9 $
+  Version:   $Name:  $ $Revision: 1.10 $
   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.9 $ $RCSfile: ifd.cpp,v $")
+EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.10 $ $RCSfile: ifd.cpp,v $")
 
 // *****************************************************************************
 // included header files
@@ -145,6 +145,12 @@ namespace Exif {
         size_ = newSize;
     } // Entry::setValue
 
+    const char* Entry::component(uint32 n) const
+    {
+        if (n >= count()) return 0;
+        return data_ + n * typeSize();
+    } // Entry::component
+
     Ifd::Ifd(IfdId ifdId)
         : alloc_(true), ifdId_(ifdId), offset_(0), next_(0)
     {
diff --git a/src/ifd.hpp b/src/ifd.hpp
index d9e5e97..9d264e4 100644
--- a/src/ifd.hpp
+++ b/src/ifd.hpp
@@ -21,7 +21,7 @@
 /*!
   @file    ifd.hpp
   @brief   Encoding and decoding of IFD (Image File Directory) data
-  @version $Name:  $ $Revision: 1.9 $
+  @version $Name:  $ $Revision: 1.10 $
   @author  Andreas Huggel (ahu)
            <a href="mailto:ahuggel at gmx.net">ahuggel at gmx.net</a>
   @date    09-Jan-04, ahu: created
@@ -156,6 +156,11 @@ namespace Exif {
           to this pointer.
         */
         const char* data() const { return data_; }
+        /*!
+          @brief Return a pointer to the n-th component, 0 if there is no 
+                 n-th component. Do not attempt to write to this pointer.
+         */
+        const char* component(uint32 n) const;
         //! Get the memory allocation mode
         bool alloc() const { return alloc_; }
         //@}

-- 
exiv2 packaging