Sophie

Sophie

distrib > * > 2008.0 > x86_64 > by-pkgid > d3f0c6549fb475a03efdb4c7f88d7cd4 > files > 3

exiv2-0.15-2.2mdv2008.0.src.rpm

Taken from http://dev.robotbattle.com/cgi-bin/viewvc.cgi/exiv2/trunk/src/nikonmn.cpp?r1=1398&r2=1399&view=patch
--- trunk/src/nikonmn.cpp	2008/03/17 15:45:27	1398
+++ trunk/src/nikonmn.cpp	2008/03/29 06:14:56	1399
@@ -931,29 +931,31 @@
     std::ostream& Nikon3MakerNote::print0x0084(std::ostream& os,
                                                const Value& value)
     {
-        if (value.count() == 4) {
-            long len1 = value.toLong(0);
-            long len2 = value.toLong(1);
-            Rational fno1 = value.toRational(2);
-            Rational fno2 = value.toRational(3);
-            os << len1;
-            if (len2 != len1) {
-                os << "-" << len2;
-            }
-            os << "mm ";
-            std::ostringstream oss;
-            oss.copyfmt(os);
-            os << "F" << std::setprecision(2)
-               << static_cast<float>(fno1.first) / fno1.second;
-            if (fno2 != fno1) {
-                os << "-" << std::setprecision(2)
-                   << static_cast<float>(fno2.first) / fno2.second;
-            }
-            os.copyfmt(oss);
-        }
-        else {
+        if (   value.count() != 4
+            || value.toRational(0).second == 0
+            || value.toRational(1).second == 0) {
             os << "(" << value << ")";
+            return os;
+        }
+        long len1 = value.toLong(0);
+        long len2 = value.toLong(1);
+
+        Rational fno1 = value.toRational(2);
+        Rational fno2 = value.toRational(3);
+        os << len1;
+        if (len2 != len1) {
+            os << "-" << len2;
+        }
+        os << "mm ";
+        std::ostringstream oss;
+        oss.copyfmt(os);
+        os << "F" << std::setprecision(2)
+           << static_cast<float>(fno1.first) / fno1.second;
+        if (fno2 != fno1) {
+            os << "-" << std::setprecision(2)
+               << static_cast<float>(fno2.first) / fno2.second;
         }
+        os.copyfmt(oss);
         return os;
     }