]>
Commit | Line | Data |
---|---|---|
66fdc3c6 JR |
1 | Author: nkbj <nkbj> |
2 | Date: Sat Aug 6 04:00:25 2016 +0000 | |
3 | ||
4 | Fix bug #407: Wrong variable type for find_green() return value. | |
5 | ||
6 | diff --git a/dcraw.cc b/dcraw.cc | |
7 | index 416fd61..bcae4f2 100644 | |
8 | --- a/dcraw.cc | |
9 | +++ b/dcraw.cc | |
10 | @@ -9341,13 +9341,13 @@ canon_a5: | |
11 | filters = 0x16161616; | |
12 | } | |
13 | if (make[0] == 'O') { | |
14 | - i = find_green (12, 32, 1188864, 3576832); | |
15 | - c = find_green (12, 32, 2383920, 2387016); | |
16 | - if (abs(i) < abs(c)) { | |
17 | - SWAP(i,c); | |
18 | + float g1 = find_green (12, 32, 1188864, 3576832); | |
19 | + float g2 = find_green (12, 32, 2383920, 2387016); | |
20 | + if (fabsf(g1) < fabsf(g2)) { | |
21 | + SWAP(g1,g2); | |
22 | load_flags = 24; | |
23 | } | |
24 | - if ((int) i < 0) filters = 0x61616161; | |
25 | + if (g1 < 0) filters = 0x61616161; | |
26 | } | |
27 | } else if (fsize == 5869568) { | |
28 | if (!timestamp && minolta_z2()) { |