Update of /cvsroot/ufraw/ufraw
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv26471
Modified Files:
ufraw_ufraw.c
Log Message:
Fix bug #366: Initialize chanMulArray in all cases. Thanks goes to Nils
Philippsen for the patch.
Index: ufraw_ufraw.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_ufraw.c,v
retrieving revision 1.277
retrieving revision 1.278
diff -u -d -r1.277 -r1.278
--- ufraw_ufraw.c 1 Jan 2014 06:00:24 -0000 1.277
+++ ufraw_ufraw.c 15 May 2014 03:30:30 -0000 1.278
@@ -1957,6 +1957,7 @@
/* For uf_manual_wb we calculate chanMul from the temperature/green. */
/* For all other it is the other way around. */
if (ufarray_is_equal(wb, uf_manual_wb)) {
+ double chanMulArray[4] = {1, 1, 1, 1 };
Temperature_to_RGB(ufnumber_value(temperature), rgbWB);
rgbWB[1] = rgbWB[1] / ufnumber_value(green);
/* Suppose we shot a white card at some temperature:
@@ -1974,12 +1975,10 @@
*/
if (uf->raw_color) {
/* If there is no color matrix it is simple */
- double chanMulArray[4];
for (c = 0; c < 3; c++)
chanMulArray[c] = raw->pre_mul[c] / rgbWB[c];
ufnumber_array_set(chanMul, chanMulArray);
} else {
- double chanMulArray[4] = {1, 1, 1, 1 };
for (c = 0; c < uf->colors; c++) {
double chanMulInv = 0;
for (cc = 0; cc < 3; cc++)
------------------------------------------------------------------------------
"Accelerate Dev Cycles with Automated Cross-Browser Testing - For FREE
Instantly run your Selenium tests across 300+ browser/OS combos.
Get unparalleled scalability from the best Selenium testing platform available
Simple to use. Nothing to install. Get started now for free."
http://p.sf.net/sfu/SauceLabs
_______________________________________________
ufraw-cvs mailing list
ufraw-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs
