Author: nkbj Date: Sat Aug 6 04:00:25 2016 +0000 Fix bug #407: Wrong variable type for find_green() return value. diff --git a/dcraw.cc b/dcraw.cc index 416fd61..bcae4f2 100644 --- a/dcraw.cc +++ b/dcraw.cc @@ -9341,13 +9341,13 @@ canon_a5: filters = 0x16161616; } if (make[0] == 'O') { - i = find_green (12, 32, 1188864, 3576832); - c = find_green (12, 32, 2383920, 2387016); - if (abs(i) < abs(c)) { - SWAP(i,c); + float g1 = find_green (12, 32, 1188864, 3576832); + float g2 = find_green (12, 32, 2383920, 2387016); + if (fabsf(g1) < fabsf(g2)) { + SWAP(g1,g2); load_flags = 24; } - if ((int) i < 0) filters = 0x61616161; + if (g1 < 0) filters = 0x61616161; } } else if (fsize == 5869568) { if (!timestamp && minolta_z2()) {