Update of /cvsroot/ufraw/ufraw
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv3431
Modified Files:
dcraw.cc
Log Message:
Fix bug #407: Wrong variable type for find_green() return value.
Index: dcraw.cc
===================================================================
RCS file: /cvsroot/ufraw/ufraw/dcraw.cc,v
retrieving revision 1.342
retrieving revision 1.343
diff -u -d -r1.342 -r1.343
--- dcraw.cc 12 May 2016 03:00:05 -0000 1.342
+++ dcraw.cc 6 Aug 2016 04:00:25 -0000 1.343
@@ -9341,13 +9341,13 @@
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()) {
------------------------------------------------------------------------------
_______________________________________________
ufraw-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs
