[UFRaw-CVS] ufraw ufraw_ufraw.c,1.49,1.50 wb_presets.c,1.11,1.12

[Udi F. <udi...@us...>]

Update of /cvsroot/ufraw/ufraw
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv1254

Modified Files:
	ufraw_ufraw.c wb_presets.c 
Log Message:
Add WB presets for the Fuji S5600 and for the Nikon D1H (with fine tuning).

Reset fine tuning value on auto wb.


Index: wb_presets.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/wb_presets.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** wb_presets.c	13 May 2006 21:09:07 -0000	1.11
--- wb_presets.c	10 Jun 2006 20:29:08 -0000	1.12
***************
*** 171,174 ****
--- 171,181 ----
    { "FUJIFILM", "FinePix S5000", "Shade", 0,	{ 2.357215, 1, 1.212016, 0 } },
  
+   { "FUJIFILM", "FinePix S5600", "Fine", 0,	{ 1.587500, 1, 1.381250, 0 } },
+   { "FUJIFILM", "FinePix S5600", "Shade", 0,	{ 1.946875, 1, 1.175000, 0 } },
+   { "FUJIFILM", "FinePix S5600", "Fluorescent Light 1", 0, { 1.948370, 1, 1.187500, 0 } },
+   { "FUJIFILM", "FinePix S5600", "Fluorescent Light 2", 0, { 1.682065, 1, 1.437500, 0 } },
+   { "FUJIFILM", "FinePix S5600", "Fluorescent Light 3", 0, { 1.595109, 1, 1.839674, 0 } },
+   { "FUJIFILM", "FinePix S5600", "Incandescent", 0, { 1.077434, 1, 2.170354, 0 } },
+ 
    { "FUJIFILM", "FinePix S7000", "Outdoor fine", 0, { 1.900000, 1, 1.525000, 0 } },
    { "FUJIFILM", "FinePix S7000", "Shade", 0, { 2.137500, 1, 1.350000, 0 } },
***************
*** 266,269 ****
--- 273,295 ----
    { "MINOLTA", "DYNAX 7D", "Flash", 3,		{ 2.101562, 1, 1.281250, 0 } },
  
+   { "NIKON", "D1H", "Incandescent", -3,		{ 1.503906, 1, 1.832031, 0 } },
+   { "NIKON", "D1H", "Incandescent", 0,		{ 1.363281, 1, 1.996094, 0 } },
+   { "NIKON", "D1H", "Incandescent", 3,		{ 1.246094, 1, 2.148438, 0 } },
+   { "NIKON", "D1H", "Fluorescent", -3,		{ 2.546875, 1, 1.175781, 0 } },
+   { "NIKON", "D1H", "Fluorescent", 0,		{ 1.925781, 1, 2.054688, 0 } },
+   { "NIKON", "D1H", "Fluorescent", 3,		{ 1.234375, 1, 2.171875, 0 } },
+   { "NIKON", "D1H", "Direct Sunlight", -3,	{ 2.230469, 1, 1.187500, 0 } },
+   { "NIKON", "D1H", "Direct Sunlight", 0,	{ 2.148438, 1, 1.246094, 0 } },
+   { "NIKON", "D1H", "Direct Sunlight", 3,	{ 2.066406, 1, 1.316406, 0 } },
+   { "NIKON", "D1H", "Flash", -3,		{ 2.453125, 1, 1.117188, 0 } },
+   { "NIKON", "D1H", "Flash", 0,			{ 2.347656, 1, 1.140625, 0 } },
+   { "NIKON", "D1H", "Flash", 3,			{ 2.242188, 1, 1.164062, 0 } },
+   { "NIKON", "D1H", "Cloudy", -3,		{ 2.441406, 1, 1.046875, 0 } },
+   { "NIKON", "D1H", "Cloudy", 0,		{ 2.300781, 1, 1.128906, 0 } },
+   { "NIKON", "D1H", "Cloudy", 3,		{ 2.207031, 1, 1.199219, 0 } },
+   { "NIKON", "D1H", "Shade", -3,		{ 2.839844, 1, 1.000000, 0 } },
+   { "NIKON", "D1H", "Shade", 0,			{ 2.628906, 1, 1.011719, 0 } },
+   { "NIKON", "D1H", "Shade", 3,			{ 2.441406, 1, 1.046875, 0 } },
+ 
    { "NIKON", "D100", "Incandescent", 0,		{ 1.406250, 1, 2.828125, 0 } },
    { "NIKON", "D100", "Fluorescent", 0,		{ 2.058594, 1, 2.617188, 0 } },

Index: ufraw_ufraw.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_ufraw.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** ufraw_ufraw.c	13 May 2006 21:09:07 -0000	1.49
--- ufraw_ufraw.c	10 Jun 2006 20:29:08 -0000	1.50
***************
*** 490,493 ****
--- 490,494 ----
          }
  	g_free(histogram);
+ 	uf->conf->WBTuning = 0;
      } else if ( !strcmp(uf->conf->wb, camera_wb) ) {
          if ( (status=dcraw_set_color_scale(raw,