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

The following commit has been merged in the master branch:
commit cd7dd0ca8ba814e9652ddd24da114f8e7f7cb10c
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sun Mar 11 01:48:45 2012 +0000

    #803: Fixed Rational/URational issues on Solaris.
---
 src/convert.cpp  | 2 +-
 src/crwimage.cpp | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/convert.cpp b/src/convert.cpp
index 85e1665..48ffeec 100644
--- a/src/convert.cpp
+++ b/src/convert.cpp
@@ -591,7 +591,7 @@ namespace Exiv2 {
             double dhour = pos->toFloat(0);
             double dmin = pos->toFloat(1);
             // Hack: Need Value::toDouble
-            URational r = pos->toRational(2);
+            Rational r = pos->toRational(2);
             double dsec = static_cast<double>(r.first)/r.second;
 
             if (!pos->value().ok()) {
diff --git a/src/crwimage.cpp b/src/crwimage.cpp
index c5ec84f..0e181a2 100644
--- a/src/crwimage.cpp
+++ b/src/crwimage.cpp
@@ -1035,7 +1035,8 @@ namespace Exiv2 {
         if (ifdId == canonSiId) {
             // Exif.Photo.FNumber
             float f = fnumber(canonEv(aperture));
-            URational ur = floatToRationalCast(f);
+            Rational r = floatToRationalCast(f);
+            URational ur(r.first, r.second);
             URationalValue fn;
             fn.value_.push_back(ur);
             image.exifData().add(ExifKey("Exif.Photo.FNumber"), &fn);

-- 
exiv2 packaging