[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=8caf58b

The following commit has been merged in the master branch:
commit 8caf58bce53cd3f57793b9f210df36fd1d70764d
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sat Feb 25 08:07:49 2012 +0000

    #809: Applied patch by Pavel Heimlich.
---
 src/nikonmn.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/nikonmn.cpp b/src/nikonmn.cpp
index d7a4ab7..079c3b2 100644
--- a/src/nikonmn.cpp
+++ b/src/nikonmn.cpp
@@ -50,7 +50,7 @@ EXIV2_RCSID("@(#) $Id$")
 #include <iomanip>
 #include <cassert>
 #include <cstring>
-#include <cmath>
+#include <math.h> //for log, pow, abs
 
 // *****************************************************************************
 // class member definitions
@@ -2477,8 +2477,8 @@ fmountlens[] = {
         std::ostringstream oss;
         oss.copyfmt(os);
         char sign = value.toLong() < 0 ? '-' : '+';
-        long h = long(abs(value.toLong())/60.0);
-        long min = abs(value.toLong()) - h*60;
+        long h = long(abs(value.toFloat())/60.0);
+        long min = abs(value.toFloat()) - h*60;
         os << std::fixed << "UTC " << sign << std::setw(2) << std::setfill('0') << h << ":" 
            << std::setw(2) << std::setfill('0') << min;
         os.copyfmt(oss);

-- 
exiv2 packaging