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

The following commit has been merged in the master branch:
commit f5f515363e658cb59ee566794e7d2b0c5f317e97
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Thu Mar 11 15:08:19 2004 +0000

    Fix ExposureTime if it is > 1 s
---
 src/tags.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/tags.cpp b/src/tags.cpp
index e8e5458..57950ea 100644
--- a/src/tags.cpp
+++ b/src/tags.cpp
@@ -20,13 +20,13 @@
  */
 /*
   File:      tags.cpp
-  Version:   $Name:  $ $Revision: 1.19 $
+  Version:   $Name:  $ $Revision: 1.20 $
   Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
   History:   15-Jan-04, ahu: created
  */
 // *****************************************************************************
 #include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.19 $ $RCSfile: tags.cpp,v $")
+EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.20 $ $RCSfile: tags.cpp,v $")
 
 // *****************************************************************************
 // included header files
@@ -561,11 +561,16 @@ namespace Exif {
     std::ostream& print0x829a(std::ostream& os, const Value& value)
     {
         Rational t = value.toRational();
-        if (t.first > 1 && t.second > 1) {
+        if (t.first > 1 && t.second > 1 && t.second >= t.first) {
             t.second = static_cast<uint32>(
                 static_cast<float>(t.second) / t.first + 0.5);
             t.first = 1;
         }
+        if (t.second > 1 && t.second < t.first) {
+            t.first = static_cast<uint32>(
+                static_cast<float>(t.first) / t.second + 0.5);
+            t.second = 1;
+        }
         if (t.second == 1) {
             os << t.first << " s";
         }

-- 
exiv2 packaging