blob: 9811c9902922606cc26f98a114c56fd50d8048f6 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
|
$NetBSD: patch-aa,v 1.1 2008/06/07 23:01:28 gdt Exp $
From upstream SVN, svn diff -r 1388:1399.
Fixes http://dev.robotbattle.com/bugs/view.php?id=0000546.
Index: src/nikonmn.cpp
===================================================================
--- src/nikonmn.cpp (revision 1398)
+++ src/nikonmn.cpp (revision 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;
}
|
