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

The following commit has been merged in the master branch:
commit da6d7ffe179e2e376313d140e1c0bac3738e11cd
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sun Sep 4 08:10:32 2011 +0000

    Round the Exif.CanonSi.MeasuredEV properly.
---
 src/canonmn.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index 085ad2b..f592311 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -20,14 +20,14 @@
  */
 /*
   File:      canonmn.cpp
-  Version:   $Rev: 2478 $
+  Version:   $Rev$
   Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
              David Cannings (dc) <david at edeca.net>
              Andi Clemens (ac) <andi.clemens at gmx.net>
  */
 // *****************************************************************************
 #include "rcsid_int.hpp"
-EXIV2_RCSID("@(#) $Id: canonmn.cpp 2478 2011-06-17 03:08:42Z ahuggel $")
+EXIV2_RCSID("@(#) $Id$")
 
 // *****************************************************************************
 // included header files
@@ -1358,8 +1358,8 @@ namespace Exiv2 {
             // see also printSi0x0017
             std::ostringstream oss;
             oss.copyfmt(os);
-            os << std::fixed << std::setprecision(2)
-               << value.toLong() / 32.0 + 5.0;
+            int res = static_cast<int>(100.0 * (value.toLong() / 32.0 + 5.0) + 0.5);
+            os << std::fixed << std::setprecision(2) << res / 100.0;
             os.copyfmt(oss);
         }
         return os;

-- 
exiv2 packaging