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

The following commit has been merged in the master branch:
commit ab0de73a9ee0eb51596f76c207565a5a3dc1d748
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Fri Mar 5 07:57:28 2004 +0000

    Added print function for ISO speed ratings
---
 src/tags.cpp | 11 ++++++++---
 src/tags.hpp |  4 +++-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/tags.cpp b/src/tags.cpp
index 7d7206b..e8e5458 100644
--- a/src/tags.cpp
+++ b/src/tags.cpp
@@ -20,13 +20,13 @@
  */
 /*
   File:      tags.cpp
-  Version:   $Name:  $ $Revision: 1.18 $
+  Version:   $Name:  $ $Revision: 1.19 $
   Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
   History:   15-Jan-04, ahu: created
  */
 // *****************************************************************************
 #include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.18 $ $RCSfile: tags.cpp,v $")
+EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.19 $ $RCSfile: tags.cpp,v $")
 
 // *****************************************************************************
 // included header files
@@ -144,7 +144,7 @@ namespace Exif {
         TagInfo(0x829d, "FNumber", "F number", exifIfd, captureCond, print0x829d),
         TagInfo(0x8822, "ExposureProgram", "Exposure program", exifIfd, captureCond, print0x8822),
         TagInfo(0x8824, "SpectralSensitivity", "Spectral sensitivity", exifIfd, captureCond, printValue),
-        TagInfo(0x8827, "ISOSpeedRatings", "ISO speed ratings", exifIfd, captureCond, printValue),
+        TagInfo(0x8827, "ISOSpeedRatings", "ISO speed ratings", exifIfd, captureCond, print0x8827),
         TagInfo(0x8828, "OECF", "Optoelectric coefficient", exifIfd, captureCond, printValue),
         TagInfo(0x9000, "ExifVersion", "Exif Version", exifIfd, exifVersion, printValue),
         TagInfo(0x9003, "DateTimeOriginal", "Date and time original image was generated", exifIfd, dateTime, printValue),
@@ -605,6 +605,11 @@ namespace Exif {
         return os;
     }
 
+    std::ostream& print0x8827(std::ostream& os, const Value& value)
+    {
+        return os << value.toLong();
+    }
+
     std::ostream& print0x9101(std::ostream& os, const Value& value)
     {
         for (long i = 0; i < value.count(); ++i) {
diff --git a/src/tags.hpp b/src/tags.hpp
index e8d3194..6909a85 100644
--- a/src/tags.hpp
+++ b/src/tags.hpp
@@ -21,7 +21,7 @@
 /*!
   @file    tags.hpp
   @brief   %Exif tag and type information
-  @version $Name:  $ $Revision: 1.17 $
+  @version $Name:  $ $Revision: 1.18 $
   @author  Andreas Huggel (ahu)
            <a href="mailto:ahuggel at gmx.net">ahuggel at gmx.net</a>
   @date    15-Jan-04, ahu: created
@@ -229,6 +229,8 @@ namespace Exif {
     std::ostream& print0x829d(std::ostream& os, const Value& value);
     //! Print the Exposure mode
     std::ostream& print0x8822(std::ostream& os, const Value& value);
+    //! Print ISO speed ratings
+    std::ostream& print0x8827(std::ostream& os, const Value& value);
     //! Print components configuration specific to compressed data
     std::ostream& print0x9101(std::ostream& os, const Value& value);
     //! Print the subject distance

-- 
exiv2 packaging