[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=027e9f4

The following commit has been merged in the master branch:
commit 027e9f4bdf8ebe47aba4983a9cd2235319a5c4a0
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Mon Mar 22 08:50:00 2004 +0000

    Added print0xa405() to print the 35mm equivalent focal length
---
 src/tags.cpp | 20 ++++++++++++++++----
 src/tags.hpp |  4 +++-
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/tags.cpp b/src/tags.cpp
index 57950ea..005f818 100644
--- a/src/tags.cpp
+++ b/src/tags.cpp
@@ -20,13 +20,13 @@
  */
 /*
   File:      tags.cpp
-  Version:   $Name:  $ $Revision: 1.20 $
+  Version:   $Name:  $ $Revision: 1.21 $
   Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
   History:   15-Jan-04, ahu: created
  */
 // *****************************************************************************
 #include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.20 $ $RCSfile: tags.cpp,v $")
+EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.21 $ $RCSfile: tags.cpp,v $")
 
 // *****************************************************************************
 // included header files
@@ -188,7 +188,7 @@ namespace Exif {
         TagInfo(0xa402, "ExposureMode", "Exposure mode", exifIfd, captureCond, print0xa402),
         TagInfo(0xa403, "WhiteBalance", "White balance", exifIfd, captureCond, print0xa403),
         TagInfo(0xa404, "DigitalZoomRatio", "Digital zoom ratio", exifIfd, captureCond, print0xa404),
-        TagInfo(0xa405, "FocalLengthIn35mmFilm", "Focal length in 35 mm film", exifIfd, captureCond, printValue),
+        TagInfo(0xa405, "FocalLengthIn35mmFilm", "Focal length in 35 mm film", exifIfd, captureCond, print0xa405),
         TagInfo(0xa406, "SceneCaptureType", "Scene capture type", exifIfd, captureCond, print0xa406),
         TagInfo(0xa407, "GainControl", "Gain control", exifIfd, captureCond, print0xa407),
         TagInfo(0xa408, "Contrast", "Contrast", exifIfd, captureCond, print0xa408),
@@ -584,7 +584,7 @@ namespace Exif {
     {
         Rational fnumber = value.toRational();
         if (fnumber.second != 0) {
-            os << "f/" << (float)fnumber.first / fnumber.second;
+            os << "F" << (float)fnumber.first / fnumber.second;
         }
         else {
             os << "(" << value << ")";
@@ -850,6 +850,18 @@ namespace Exif {
         return os;
     }
 
+    std::ostream& print0xa405(std::ostream& os, const Value& value)
+    {
+        long length = value.toLong();
+        if (length == 0) {
+            os << "Unknown";
+        }
+        else {
+            os << length << ".0 mm";
+        }
+        return os;
+    }
+
     std::ostream& print0xa406(std::ostream& os, const Value& value)
     {
         long scene = value.toLong();
diff --git a/src/tags.hpp b/src/tags.hpp
index 6909a85..11157dc 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.18 $
+  @version $Name:  $ $Revision: 1.19 $
   @author  Andreas Huggel (ahu)
            <a href="mailto:ahuggel at gmx.net">ahuggel at gmx.net</a>
   @date    15-Jan-04, ahu: created
@@ -259,6 +259,8 @@ namespace Exif {
     std::ostream& print0xa403(std::ostream& os, const Value& value);
     //! Print digital zoom ratio
     std::ostream& print0xa404(std::ostream& os, const Value& value);
+    //! Print 35mm equivalent focal length 
+    std::ostream& print0xa405(std::ostream& os, const Value& value);
     //! Print scene capture type
     std::ostream& print0xa406(std::ostream& os, const Value& value);
     //! Print overall image gain adjustment

-- 
exiv2 packaging