[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=09ddf6c

The following commit has been merged in the master branch:
commit 09ddf6c87d6ffc41e6db120b1c09ee2da97cf89e
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sun Dec 19 16:23:55 2004 +0000

    Minor dox fix
---
 src/ifd.hpp | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/ifd.hpp b/src/ifd.hpp
index 22c0b10..aae0e63 100644
--- a/src/ifd.hpp
+++ b/src/ifd.hpp
@@ -377,28 +377,6 @@ namespace Exiv2 {
          */
         int read(const byte* buf, long len, ByteOrder byteOrder, long offset =0);
         /*!
-          @brief Read a sub-IFD from the location pointed to by the directory entry 
-                 with the given tag.
-
-          @param dest References the destination IFD.
-          @param buf The data buffer to read from. The buffer must contain all Exif 
-                     data starting from the TIFF header (unlike the read() method).
-          @param len Number of bytes in the data buffer 
-          @param byteOrder Applicable byte order (little or big endian).
-          @param tag Tag to look for.
-
-          @return 0 if successful;<BR>
-                  6 if reading the sub-IFD failed (see read() above) or
-                    the location pointed to by the directory entry with the 
-                    given tag is outside of the data buffer.
-
-          @note It is not considered an error if the tag cannot be found in the 
-                IFD. 0 is returned and no action is taken in this case.
-        */
-        int readSubIfd(
-            Ifd& dest, const byte* buf, long len, ByteOrder byteOrder, uint16_t tag
-        ) const;
-        /*!
           @brief Copy the IFD to a data array, update the offsets of the IFD and
                  all its entries, return the number of bytes written.
 
@@ -469,6 +447,28 @@ namespace Exiv2 {
 
         //! @name Accessors
         //@{
+        /*!
+          @brief Read a sub-IFD from the location pointed to by the directory entry 
+                 with the given tag.
+
+          @param dest References the destination IFD.
+          @param buf The data buffer to read from. The buffer must contain all Exif 
+                     data starting from the TIFF header (unlike the read() method).
+          @param len Number of bytes in the data buffer 
+          @param byteOrder Applicable byte order (little or big endian).
+          @param tag Tag to look for.
+
+          @return 0 if successful;<BR>
+                  6 if reading the sub-IFD failed (see read() above) or
+                    the location pointed to by the directory entry with the 
+                    given tag is outside of the data buffer.
+
+          @note It is not considered an error if the tag cannot be found in the 
+                IFD. 0 is returned and no action is taken in this case.
+        */
+        int readSubIfd(
+            Ifd& dest, const byte* buf, long len, ByteOrder byteOrder, uint16_t tag
+        ) const;
         //! Get the memory allocation mode, see the Ifd class description for details
         bool alloc() const { return alloc_; }
         //! The first entry

-- 
exiv2 packaging