Update of /cvsroot/ufraw/ufraw
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv4466
Modified Files:
ufraw_ufraw.c
Log Message:
Remove some reduntant calls to uf_set_wb().
Index: ufraw_ufraw.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_ufraw.c,v
retrieving revision 1.242
retrieving revision 1.243
diff -u -d -r1.242 -r1.243
--- ufraw_ufraw.c 22 Feb 2010 23:27:20 -0000 1.242
+++ ufraw_ufraw.c 23 Feb 2010 01:29:59 -0000 1.243
@@ -675,9 +675,10 @@
double oldTuning = ufnumber_value(wbTuning);
ufraw_set_wb(uf);
/* Here ufobject's automation goes against us. A change in
- * ChannelMultipliers would change ufWB to uf_manual_wb.
+ * ChannelMultipliers might change ufWB to uf_manual_wb.
* So we need to change it back. */
- ufobject_set_string(wb, oldWB);
+ if (!ufarray_is_equal(wb, uf_auto_wb))
+ ufobject_set_string(wb, oldWB);
ufnumber_set(wbTuning, oldTuning);
g_free(oldWB);
}
@@ -2018,7 +2019,7 @@
_("Cannot use camera white balance, "
"reverting to auto white balance."));
ufobject_set_string(wb, uf_auto_wb);
- return ufraw_set_wb(uf);
+ return UFRAW_SUCCESS;
}
if (status!=DCRAW_SUCCESS)
return status;
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
ufraw-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs
