[UFRaw-CVS] ufraw wb_presets.c,1.153,1.154

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

Update of /cvsroot/ufraw/ufraw
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv20467

Modified Files:
	wb_presets.c 
Log Message:
Added WB presets and fine-tuning for the Nikon D300S.


Index: wb_presets.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/wb_presets.c,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -d -r1.153 -r1.154
--- wb_presets.c	26 Feb 2010 23:20:51 -0000	1.153
+++ wb_presets.c	28 Feb 2010 03:52:32 -0000	1.154
@@ -1864,6 +1864,43 @@
   { "NIKON", "D300", "9090K", 0,		{ 2.019531, 1, 1.027344, 0 } },
   { "NIKON", "D300", "10000K", 0,		{ 2.109375, 1, 1.000000, 0 } },
 
+  { "NIKON", "D300S", DirectSunlight, -6,	{ 1.687, 1, 1.168, 0 } },
+  { "NIKON", "D300S", DirectSunlight, 0,	{ 1.563, 1, 1.309, 0 } },
+  { "NIKON", "D300S", DirectSunlight, 6,	{ 1.430, 1, 1.457, 0 } },
+  { "NIKON", "D300S", Flash, -6,		{ 1.910, 1, 1.059, 0 } },
+  { "NIKON", "D300S", Flash, 0,			{ 1.687, 1, 1.152, 0 } },
+  { "NIKON", "D300S", Flash, 6,			{ 1.555, 1, 1.246, 0 } },
+  { "NIKON", "D300S", Cloudy, -6,		{ 1.820, 1, 1.094, 0 } },
+  { "NIKON", "D300S", Cloudy, 0,		{ 1.664, 1, 1.187, 0 } },
+  { "NIKON", "D300S", Cloudy, 6,		{ 1.543, 1, 1.336, 0 } },
+  { "NIKON", "D300S", Shade, -6,		{ 2.156, 1, 1.000, 0 } },
+  { "NIKON", "D300S", Shade, 0,			{ 1.902, 1, 1.066, 0 } },
+  { "NIKON", "D300S", Shade, 6,			{ 1.723, 1, 1.141, 0 } },
+  { "NIKON", "D300S", Incandescent, -6,		{ 1.098, 1, 1.898, 0 } },
+  { "NIKON", "D300S", Incandescent, 0,		{ 1.020, 1, 2.109, 0 } },
+  { "NIKON", "D300S", Incandescent, 6,		{ 1, 1.049, 2.451, 0 } },
+  { "NIKON", "D300S", SodiumVaporFluorescent, -6, { 1.031, 1, 2.102, 0 } },
+  { "NIKON", "D300S", SodiumVaporFluorescent, 0, { 1, 1.053, 2.444, 0 } },
+  { "NIKON", "D300S", SodiumVaporFluorescent, 6, { 1, 1.138, 2.973, 0 } },
+  { "NIKON", "D300S", WarmWhiteFluorescent, -6,	{ 1.129, 1, 1.848, 0 } },
+  { "NIKON", "D300S", WarmWhiteFluorescent, 0,	{ 1.047, 1, 1.961, 0 } },
+  { "NIKON", "D300S", WarmWhiteFluorescent, 6,	{ 1, 1.024, 2.112, 0 } },
+  { "NIKON", "D300S", WhiteFluorescent, -6,	{ 1.453, 1, 2.051, 0 } },
+  { "NIKON", "D300S", WhiteFluorescent, 0,	{ 1.191, 1, 2.305, 0 } },
+  { "NIKON", "D300S", WhiteFluorescent, 6,	{ 1, 1.153, 2.977, 0 } },
+  { "NIKON", "D300S", CoolWhiteFluorescent, -6,	{ 1.668, 1, 1.801, 0 } },
+  { "NIKON", "D300S", CoolWhiteFluorescent, 0,	{ 1.469, 1, 2.035, 0 } },
+  { "NIKON", "D300S", CoolWhiteFluorescent, 6,	{ 1.211, 1, 2.289, 0 } },
+  { "NIKON", "D300S", DayWhiteFluorescent, -6,	{ 1.625, 1, 1.195, 0 } },
+  { "NIKON", "D300S", DayWhiteFluorescent, 0,	{ 1.492, 1, 1.363, 0 } },
+  { "NIKON", "D300S", DayWhiteFluorescent, 6,	{ 1.375, 1, 1.520, 0 } },
+  { "NIKON", "D300S", DaylightFluorescent, -6,	{ 1.852, 1, 1.000, 0 } },
+  { "NIKON", "D300S", DaylightFluorescent, 0,	{ 1.699, 1, 1.102, 0 } },
+  { "NIKON", "D300S", DaylightFluorescent, 6,	{ 1.563, 1, 1.273, 0 } },
+  { "NIKON", "D300S", HighTempMercuryVaporFluorescent, -6, { 2.039, 1, 1.156, 0 } }, 
+  { "NIKON", "D300S", HighTempMercuryVaporFluorescent, 0, { 1.961, 1, 1.328, 0 } },
+  { "NIKON", "D300S", HighTempMercuryVaporFluorescent, 6, { 1.855, 1, 1.523, 0 } },
+
   { "NIKON", "D700", DirectSunlight, -6,	{ 1.980469, 1, 1.199219, 0 } },
   { "NIKON", "D700", DirectSunlight, 0,		{ 1.816406, 1, 1.355469, 0 } },
   { "NIKON", "D700", DirectSunlight, 6,		{ 1.652344, 1, 1.523437, 0 } },