[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=4f69969

The following commit has been merged in the master branch:
commit 4f69969121376e0055e3ca2ff5b0a11273908df0
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Thu Apr 1 02:58:28 2004 +0000

    Minor doc fix
---
 src/exif.hpp  | 6 +++++-
 src/image.hpp | 7 ++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/exif.hpp b/src/exif.hpp
index c3d539e..00530df 100644
--- a/src/exif.hpp
+++ b/src/exif.hpp
@@ -21,7 +21,7 @@
 /*!
   @file    exif.hpp
   @brief   Encoding and decoding of %Exif data
-  @version $Name:  $ $Revision: 1.34 $
+  @version $Name:  $ $Revision: 1.35 $
   @author  Andreas Huggel (ahu)
            <a href="mailto:ahuggel at gmx.net">ahuggel at gmx.net</a>
   @date    09-Jan-04, ahu: created
@@ -658,6 +658,10 @@ namespace Exif {
         //! Return the file extension of the thumbnail image file
         const char* thumbnailFormat() const
             { return pThumbnail_ ? pThumbnail_->format() : ""; }
+        /*!
+          @brief Return the file extension for the format of the thumbnail 
+                 (".tif", ".jpg").
+         */
         const char* thumbnailExtension() const 
             { return pThumbnail_ ? pThumbnail_->extension() : ""; }
         /*!
diff --git a/src/image.hpp b/src/image.hpp
index 000a14d..493b774 100644
--- a/src/image.hpp
+++ b/src/image.hpp
@@ -21,7 +21,7 @@
 /*!
   @file    image.hpp
   @brief   Class JpegImage to access JPEG images
-  @version $Name:  $ $Revision: 1.7 $
+  @version $Name:  $ $Revision: 1.8 $
   @author  Andreas Huggel (ahu)
            <a href="mailto:ahuggel at gmx.net">ahuggel at gmx.net</a>
   @date    09-Jan-04, ahu: created
@@ -286,6 +286,11 @@ namespace Exif {
         /*!
           @brief  Determine if the content of the stream is a JPEG image. 
           @param  is Input stream to test.
+          @param advance Flag indicating whether the read position in the stream
+                         should be advanced by the number of characters read to
+                         analyse the image stream (true) or left at its original
+                         position (false). This applies only if the image type 
+                         matches.
           @return true if the input stream starts with the JPEG SOI marker.
                   The stream is not advanced in this case.<BR>
                   false if the input stream does not begin with the JPEG SOI

-- 
exiv2 packaging