[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=367fa36

The following commit has been merged in the master branch:
commit 367fa3626fccd6fa7336f07a41200359e5fea955
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sun Jun 27 04:52:49 2004 +0000

    Changed log(2) to log(2.0)
---
 src/actions.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/actions.cpp b/src/actions.cpp
index 3c10e43..df3415d 100644
--- a/src/actions.cpp
+++ b/src/actions.cpp
@@ -20,13 +20,13 @@
  */
 /*
   File:      actions.cpp
-  Version:   $Name:  $ $Revision: 1.26 $
+  Version:   $Name:  $ $Revision: 1.27 $
   Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
   History:   08-Dec-03, ahu: created
  */
 // *****************************************************************************
 #include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.26 $ $RCSfile: actions.cpp,v $")
+EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.27 $ $RCSfile: actions.cpp,v $")
 
 // *****************************************************************************
 // included header files
@@ -178,7 +178,7 @@ namespace Action {
         if (0 == printTag(exifData, "Image.CaptureConditions.ExposureTime")) {
             md = exifData.findKey("Image.CaptureConditions.ShutterSpeedValue");
             if (md != exifData.end()) {
-                double tmp = exp(log(2) * md->toFloat()) + 0.5;
+                double tmp = exp(log(2.0) * md->toFloat()) + 0.5;
                 if (tmp > 1) {
                     std::cout << "1/" << static_cast<long>(tmp) << " s";
                 }
@@ -197,7 +197,7 @@ namespace Action {
             md = exifData.findKey("Image.CaptureConditions.ApertureValue");
             if (md != exifData.end()) {
                 std::cout << std::fixed << std::setprecision(1)
-                          << "F" << exp(log(2) * md->toFloat() / 2);
+                          << "F" << exp(log(2.0) * md->toFloat() / 2);
             }
         }
         std::cout << "
";

-- 
exiv2 packaging