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

Modified Files:
        wb_presets.c 
Log Message:
Update Nikon D300 WB presets.

Index: wb_presets.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/wb_presets.c,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -d -r1.151 -r1.152
--- wb_presets.c        26 Feb 2010 01:40:11 -0000      1.151
+++ wb_presets.c        26 Feb 2010 15:05:14 -0000      1.152
@@ -1663,48 +1663,47 @@
   { "NIKON", "D200", "9300K", 0,               { 2.367188, 1, 1.070313, 0 } },
   { "NIKON", "D200", "10000K", 0,              { 2.453125, 1, 1.035156, 0 } },
 
-  /* D300 basic + fine tune WB presets */
   { "NIKON", "D300", Incandescent, -6,         { 1.097656, 1, 1.898438, 0 } },
-  { "NIKON", "D300", Incandescent, -5,         { 1.085938, 1, 1.929687, 0 } },
+  { "NIKON", "D300", Incandescent, -5,         { 1.085938, 1, 1.929688, 0 } },
   { "NIKON", "D300", Incandescent, -4,         { 1.070313, 1, 1.964844, 0 } },
   { "NIKON", "D300", Incandescent, -3,         { 1.058594, 1, 2.000000, 0 } },
   { "NIKON", "D300", Incandescent, -2,         { 1.042969, 1, 2.035156, 0 } },
   { "NIKON", "D300", Incandescent, -1,         { 1.031250, 1, 2.074219, 0 } },
   { "NIKON", "D300", Incandescent, 0,          { 1.019531, 1, 2.109375, 0 } },
   { "NIKON", "D300", Incandescent, 1,          { 1.007813, 1, 2.144531, 0 } },
-  { "NIKON", "D300", Incandescent, 2,          { 1.000000, 1, 2.183594, 0 } },
-  { "NIKON", "D300", Incandescent, 3,          { 1.000000, 1, 2.218750, 0 } },
-  { "NIKON", "D300", Incandescent, 4,          { 1.000000, 1, 2.257812, 0 } },
-  { "NIKON", "D300", Incandescent, 5,          { 1.000000, 1, 2.296875, 0 } },
-  { "NIKON", "D300", Incandescent, 6,          { 1.000000, 1, 2.335937, 0 } },
+  { "NIKON", "D300", Incandescent, 2,          { 0.996094, 1, 2.183594, 0 } },
+  { "NIKON", "D300", Incandescent, 3,          { 0.984375, 1, 2.218750, 0 } },
+  { "NIKON", "D300", Incandescent, 4,          { 0.972656, 1, 2.257813, 0 } },
+  { "NIKON", "D300", Incandescent, 5,          { 0.964844, 1, 2.296875, 0 } },
+  { "NIKON", "D300", Incandescent, 6,          { 0.953125, 1, 2.335938, 0 } },
   { "NIKON", "D300", SodiumVaporFluorescent, -6, { 1.031250, 1, 2.101563, 0 } 
},
   { "NIKON", "D300", SodiumVaporFluorescent, -5, { 1.015625, 1, 2.136719, 0 } 
},
   { "NIKON", "D300", SodiumVaporFluorescent, -4, { 1.003906, 1, 2.167969, 0 } 
},
-  { "NIKON", "D300", SodiumVaporFluorescent, -3, { 0.9882813, 1, 2.207031, 0 } 
},
-  { "NIKON", "D300", SodiumVaporFluorescent, -2, { 0.9765625, 1, 2.242187, 0 } 
},
-  { "NIKON", "D300", SodiumVaporFluorescent, -1, { 0.9609375, 1, 2.281250, 0 } 
},
-  { "NIKON", "D300", SodiumVaporFluorescent, 0,        { 0.9492188, 1, 
2.320313, 0 } },
-  { "NIKON", "D300", SodiumVaporFluorescent, 1,        { 0.9492188, 1, 
2.363281, 0 } },
-  { "NIKON", "D300", SodiumVaporFluorescent, 2, { 0.9492188, 1, 2.410156, 0 } 
},
-  { "NIKON", "D300", SodiumVaporFluorescent, 3,        { 0.9492188, 1, 
2.457031, 0 } },
-  { "NIKON", "D300", SodiumVaporFluorescent, 4,        { 0.9492188, 1, 
2.503906, 0 } },
-  { "NIKON", "D300", SodiumVaporFluorescent, 5,        { 0.9492188, 1, 
2.558594, 0 } },
-  { "NIKON", "D300", SodiumVaporFluorescent, 6,        { 0.9492188, 1, 
2.613281, 0 } },
+  { "NIKON", "D300", SodiumVaporFluorescent, -3, { 0.988281, 1, 2.207031, 0 } 
},
+  { "NIKON", "D300", SodiumVaporFluorescent, -2, { 0.976563, 1, 2.242188, 0 } 
},
+  { "NIKON", "D300", SodiumVaporFluorescent, -1, { 0.960938, 1, 2.281250, 0 } 
},
+  { "NIKON", "D300", SodiumVaporFluorescent, 0,        { 0.949219, 1, 
2.320313, 0 } },
+  { "NIKON", "D300", SodiumVaporFluorescent, 1,        { 0.937500, 1, 
2.363281, 0 } },
+  { "NIKON", "D300", SodiumVaporFluorescent, 2,        { 0.925781, 1, 
2.410156, 0 } },
+  { "NIKON", "D300", SodiumVaporFluorescent, 3,        { 0.914063, 1, 
2.457031, 0 } },
+  { "NIKON", "D300", SodiumVaporFluorescent, 4,        { 0.902344, 1, 
2.503906, 0 } },
+  { "NIKON", "D300", SodiumVaporFluorescent, 5,        { 0.890625, 1, 
2.558594, 0 } },
+  { "NIKON", "D300", SodiumVaporFluorescent, 6,        { 0.878906, 1, 
2.613281, 0 } },
   { "NIKON", "D300", WarmWhiteFluorescent, -6, { 1.128906, 1, 1.847656, 0 } },
-  { "NIKON", "D300", WarmWhiteFluorescent, -5, { 1.113281, 1, 1.867187, 0 } },
+  { "NIKON", "D300", WarmWhiteFluorescent, -5, { 1.113281, 1, 1.867188, 0 } },
   { "NIKON", "D300", WarmWhiteFluorescent, -4, { 1.097656, 1, 1.886719, 0 } },
   { "NIKON", "D300", WarmWhiteFluorescent, -3, { 1.085938, 1, 1.906250, 0 } },
   { "NIKON", "D300", WarmWhiteFluorescent, -2, { 1.070313, 1, 1.925781, 0 } },
-  { "NIKON", "D300", WarmWhiteFluorescent, -1, { 1.058594, 1, 1.945312, 0 } },
-  { "NIKON", "D300", WarmWhiteFluorescent, 0,  { 1.046875, 1, 1.960937, 0 } },
+  { "NIKON", "D300", WarmWhiteFluorescent, -1, { 1.058594, 1, 1.945313, 0 } },
+  { "NIKON", "D300", WarmWhiteFluorescent, 0,  { 1.046875, 1, 1.960938, 0 } },
   { "NIKON", "D300", WarmWhiteFluorescent, 1,  { 1.035156, 1, 1.980469, 0 } },
-  { "NIKON", "D300", WarmWhiteFluorescent, 2,  { 1.023437, 1, 1.996094, 0 } },
+  { "NIKON", "D300", WarmWhiteFluorescent, 2,  { 1.023438, 1, 1.996094, 0 } },
   { "NIKON", "D300", WarmWhiteFluorescent, 3,  { 1.007813, 1, 2.015625, 0 } },
   { "NIKON", "D300", WarmWhiteFluorescent, 4,  { 1.000000, 1, 2.031250, 0 } },
-  { "NIKON", "D300", WarmWhiteFluorescent, 5,  { 1.000000, 1, 2.046875, 0 } },
-  { "NIKON", "D300", WarmWhiteFluorescent, 6,  { 1.000000, 1, 2.062500, 0 } },
+  { "NIKON", "D300", WarmWhiteFluorescent, 5,  { 0.988281, 1, 2.046875, 0 } },
+  { "NIKON", "D300", WarmWhiteFluorescent, 6,  { 0.976563, 1, 2.062500, 0 } },
   { "NIKON", "D300", WhiteFluorescent, -6,     { 1.453125, 1, 2.050781, 0 } },
-  { "NIKON", "D300", WhiteFluorescent, -5,     { 1.414062, 1, 2.093750, 0 } },
+  { "NIKON", "D300", WhiteFluorescent, -5,     { 1.414063, 1, 2.093750, 0 } },
   { "NIKON", "D300", WhiteFluorescent, -4,     { 1.371094, 1, 2.132813, 0 } },
   { "NIKON", "D300", WhiteFluorescent, -3,     { 1.328125, 1, 2.175781, 0 } },
   { "NIKON", "D300", WhiteFluorescent, -2,     { 1.285156, 1, 2.218750, 0 } },
@@ -1712,29 +1711,29 @@
   { "NIKON", "D300", WhiteFluorescent, 0,      { 1.191406, 1, 2.304688, 0 } },
   { "NIKON", "D300", WhiteFluorescent, 1,      { 1.140625, 1, 2.351563, 0 } },
   { "NIKON", "D300", WhiteFluorescent, 2,      { 1.089844, 1, 2.394531, 0 } },
-  { "NIKON", "D300", WhiteFluorescent, 3,      { 1.039062, 1, 2.441406, 0 } },
-  { "NIKON", "D300", WhiteFluorescent, 4,      { 1.000000, 1, 2.488281, 0 } },
-  { "NIKON", "D300", WhiteFluorescent, 5,      { 1.000000, 1, 2.535156, 0 } },
-  { "NIKON", "D300", WhiteFluorescent, 6,      { 1.000000, 1, 2.582031, 0 } },
+  { "NIKON", "D300", WhiteFluorescent, 3,      { 1.039063, 1, 2.441406, 0 } },
+  { "NIKON", "D300", WhiteFluorescent, 4,      { 0.984375, 1, 2.488281, 0 } },
+  { "NIKON", "D300", WhiteFluorescent, 5,      { 0.925781, 1, 2.535156, 0 } },
+  { "NIKON", "D300", WhiteFluorescent, 6,      { 0.867188, 1, 2.582031, 0 } },
   { "NIKON", "D300", CoolWhiteFluorescent, -6, { 1.667969, 1, 1.800781, 0 } },
   { "NIKON", "D300", CoolWhiteFluorescent, -5, { 1.636719, 1, 1.835938, 0 } },
   { "NIKON", "D300", CoolWhiteFluorescent, -4, { 1.605469, 1, 1.875000, 0 } },
-  { "NIKON", "D300", CoolWhiteFluorescent, -3, { 1.574219, 1, 1.914062, 0 } },
+  { "NIKON", "D300", CoolWhiteFluorescent, -3, { 1.574219, 1, 1.914063, 0 } },
   { "NIKON", "D300", CoolWhiteFluorescent, -2, { 1.539063, 1, 1.953125, 0 } },
   { "NIKON", "D300", CoolWhiteFluorescent, -1, { 1.503906, 1, 1.996094, 0 } },
   { "NIKON", "D300", CoolWhiteFluorescent, 0,  { 1.468750, 1, 2.035156, 0 } },
-  { "NIKON", "D300", CoolWhiteFluorescent, 1,  { 1.429687, 1, 2.074219, 0 } },
+  { "NIKON", "D300", CoolWhiteFluorescent, 1,  { 1.429688, 1, 2.074219, 0 } },
   { "NIKON", "D300", CoolWhiteFluorescent, 2,  { 1.386719, 1, 2.117188, 0 } },
   { "NIKON", "D300", CoolWhiteFluorescent, 3,  { 1.347656, 1, 2.160156, 0 } },
-  { "NIKON", "D300", CoolWhiteFluorescent, 4,  { 1.304687, 1, 2.203125, 0 } },
-  { "NIKON", "D300", CoolWhiteFluorescent, 5,  { 1.257812, 1, 2.246094, 0 } },
-  { "NIKON", "D300", CoolWhiteFluorescent, 6,  { 1.210937, 1, 2.289063, 0 } },
+  { "NIKON", "D300", CoolWhiteFluorescent, 4,  { 1.304688, 1, 2.203125, 0 } },
+  { "NIKON", "D300", CoolWhiteFluorescent, 5,  { 1.257813, 1, 2.246094, 0 } },
+  { "NIKON", "D300", CoolWhiteFluorescent, 6,  { 1.210938, 1, 2.289063, 0 } },
   { "NIKON", "D300", DayWhiteFluorescent, -6,  { 1.625000, 1, 1.195313, 0 } },
   { "NIKON", "D300", DayWhiteFluorescent, -5,  { 1.601563, 1, 1.222656, 0 } },
   { "NIKON", "D300", DayWhiteFluorescent, -4,  { 1.582031, 1, 1.253906, 0 } },
   { "NIKON", "D300", DayWhiteFluorescent, -3,  { 1.558594, 1, 1.281250, 0 } },
   { "NIKON", "D300", DayWhiteFluorescent, -2,  { 1.535156, 1, 1.308594, 0 } },
-  { "NIKON", "D300", DayWhiteFluorescent, -1,  { 1.515625, 1, 1.335937, 0 } },
+  { "NIKON", "D300", DayWhiteFluorescent, -1,  { 1.515625, 1, 1.335938, 0 } },
   { "NIKON", "D300", DayWhiteFluorescent, 0,   { 1.492188, 1, 1.363281, 0 } },
   { "NIKON", "D300", DayWhiteFluorescent, 1,   { 1.472656, 1, 1.390625, 0 } },
   { "NIKON", "D300", DayWhiteFluorescent, 2,   { 1.453125, 1, 1.417969, 0 } },
@@ -1746,7 +1745,7 @@
   { "NIKON", "D300", DaylightFluorescent, -5,  { 1.824219, 1, 1.000000, 0 } },
   { "NIKON", "D300", DaylightFluorescent, -4,  { 1.796875, 1, 1.000000, 0 } },
   { "NIKON", "D300", DaylightFluorescent, -3,  { 1.773438, 1, 1.007813, 0 } },
-  { "NIKON", "D300", DaylightFluorescent, -2,  { 1.750000, 1, 1.039062, 0 } },
+  { "NIKON", "D300", DaylightFluorescent, -2,  { 1.750000, 1, 1.039063, 0 } },
   { "NIKON", "D300", DaylightFluorescent, -1,  { 1.722656, 1, 1.070313, 0 } },
   { "NIKON", "D300", DaylightFluorescent, 0,   { 1.699219, 1, 1.101563, 0 } },
   { "NIKON", "D300", DaylightFluorescent, 1,   { 1.675781, 1, 1.128906, 0 } },
@@ -1754,33 +1753,33 @@
   { "NIKON", "D300", DaylightFluorescent, 3,   { 1.628906, 1, 1.187500, 0 } },
   { "NIKON", "D300", DaylightFluorescent, 4,   { 1.605469, 1, 1.218750, 0 } },
   { "NIKON", "D300", DaylightFluorescent, 5,   { 1.585938, 1, 1.246094, 0 } },
-  { "NIKON", "D300", DaylightFluorescent, 6,   { 1.562500, 1, 1.273437, 0 } },
+  { "NIKON", "D300", DaylightFluorescent, 6,   { 1.562500, 1, 1.273438, 0 } },
   { "NIKON", "D300", HighTempMercuryVaporFluorescent, -6, { 2.039063, 1, 
1.156250, 0 } },
   { "NIKON", "D300", HighTempMercuryVaporFluorescent, -5, { 2.027344, 1, 
1.183594, 0 } },
-  { "NIKON", "D300", HighTempMercuryVaporFluorescent, -4, { 2.015625, 1, 
1.210937, 0 } },
+  { "NIKON", "D300", HighTempMercuryVaporFluorescent, -4, { 2.015625, 1, 
1.210938, 0 } },
   { "NIKON", "D300", HighTempMercuryVaporFluorescent, -3, { 2.003906, 1, 
1.238281, 0 } },
-  { "NIKON", "D300", HighTempMercuryVaporFluorescent, -2, { 1.992187, 1, 
1.269531, 0 } },
+  { "NIKON", "D300", HighTempMercuryVaporFluorescent, -2, { 1.992188, 1, 
1.269531, 0 } },
   { "NIKON", "D300", HighTempMercuryVaporFluorescent, -1, { 1.976563, 1, 
1.300781, 0 } },
-  { "NIKON", "D300", HighTempMercuryVaporFluorescent, 0, { 1.960937, 1, 
1.328125, 0 } },
-  { "NIKON", "D300", HighTempMercuryVaporFluorescent, 1, { 1.945312, 1, 
1.359375, 0 } },
-  { "NIKON", "D300", HighTempMercuryVaporFluorescent, 2, { 1.929687, 1, 
1.390625, 0 } },
-  { "NIKON", "D300", HighTempMercuryVaporFluorescent, 3, { 1.914062, 1, 
1.421875, 0 } },
+  { "NIKON", "D300", HighTempMercuryVaporFluorescent, 0, { 1.960938, 1, 
1.328125, 0 } },
+  { "NIKON", "D300", HighTempMercuryVaporFluorescent, 1, { 1.945313, 1, 
1.359375, 0 } },
+  { "NIKON", "D300", HighTempMercuryVaporFluorescent, 2, { 1.929688, 1, 
1.390625, 0 } },
+  { "NIKON", "D300", HighTempMercuryVaporFluorescent, 3, { 1.914063, 1, 
1.421875, 0 } },
   { "NIKON", "D300", HighTempMercuryVaporFluorescent, 4, { 1.894531, 1, 
1.457031, 0 } },
   { "NIKON", "D300", HighTempMercuryVaporFluorescent, 5, { 1.875000, 1, 
1.488281, 0 } },
-  { "NIKON", "D300", HighTempMercuryVaporFluorescent, 6, { 1.855469, 1, 
1.523437, 0 } },
+  { "NIKON", "D300", HighTempMercuryVaporFluorescent, 6, { 1.855469, 1, 
1.523438, 0 } },
   { "NIKON", "D300", DirectSunlight, -6,       { 1.687500, 1, 1.167969, 0 } },
-  { "NIKON", "D300", DirectSunlight, -5,       { 1.664062, 1, 1.187500, 0 } },
+  { "NIKON", "D300", DirectSunlight, -5,       { 1.664063, 1, 1.187500, 0 } },
   { "NIKON", "D300", DirectSunlight, -4,       { 1.644531, 1, 1.207031, 0 } },
   { "NIKON", "D300", DirectSunlight, -3,       { 1.625000, 1, 1.230469, 0 } },
   { "NIKON", "D300", DirectSunlight, -2,       { 1.601563, 1, 1.253906, 0 } },
   { "NIKON", "D300", DirectSunlight, -1,       { 1.582031, 1, 1.281250, 0 } },
   { "NIKON", "D300", DirectSunlight, 0,                { 1.562500, 1, 
1.308594, 0 } },
-  { "NIKON", "D300", DirectSunlight, 1,                { 1.542969, 1, 
1.335937, 0 } },
-  { "NIKON", "D300", DirectSunlight, 2,                { 1.523437, 1, 
1.359375, 0 } },
+  { "NIKON", "D300", DirectSunlight, 1,                { 1.542969, 1, 
1.335938, 0 } },
+  { "NIKON", "D300", DirectSunlight, 2,                { 1.523438, 1, 
1.359375, 0 } },
   { "NIKON", "D300", DirectSunlight, 3,                { 1.503906, 1, 
1.386719, 0 } },
-  { "NIKON", "D300", DirectSunlight, 4,                { 1.480469, 1, 
1.414062, 0 } },
+  { "NIKON", "D300", DirectSunlight, 4,                { 1.480469, 1, 
1.414063, 0 } },
   { "NIKON", "D300", DirectSunlight, 5,                { 1.457031, 1, 
1.437500, 0 } },
-  { "NIKON", "D300", DirectSunlight, 6,                { 1.429687, 1, 
1.457031, 0 } },
+  { "NIKON", "D300", DirectSunlight, 6,                { 1.429688, 1, 
1.457031, 0 } },
   { "NIKON", "D300", Flash, -6,                        { 1.910156, 1, 
1.058594, 0 } },
   { "NIKON", "D300", Flash, -5,                        { 1.863281, 1, 
1.078125, 0 } },
   { "NIKON", "D300", Flash, -4,                        { 1.820313, 1, 
1.093750, 0 } },
@@ -1788,25 +1787,25 @@
   { "NIKON", "D300", Flash, -2,                        { 1.746094, 1, 
1.121094, 0 } },
   { "NIKON", "D300", Flash, -1,                        { 1.714844, 1, 
1.136719, 0 } },
   { "NIKON", "D300", Flash, 0,                 { 1.687500, 1, 1.152344, 0 } },
-  { "NIKON", "D300", Flash, 1,                 { 1.660156, 1, 1.164062, 0 } },
-  { "NIKON", "D300", Flash, 2,                 { 1.636719, 1, 1.179687, 0 } },
+  { "NIKON", "D300", Flash, 1,                 { 1.660156, 1, 1.164063, 0 } },
+  { "NIKON", "D300", Flash, 2,                 { 1.636719, 1, 1.179688, 0 } },
   { "NIKON", "D300", Flash, 3,                 { 1.613281, 1, 1.195313, 0 } },
-  { "NIKON", "D300", Flash, 4,                 { 1.593750, 1, 1.210937, 0 } },
+  { "NIKON", "D300", Flash, 4,                 { 1.593750, 1, 1.210938, 0 } },
   { "NIKON", "D300", Flash, 5,                 { 1.574219, 1, 1.230469, 0 } },
   { "NIKON", "D300", Flash, 6,                 { 1.554688, 1, 1.246094, 0 } },
   { "NIKON", "D300", Cloudy, -6,               { 1.820313, 1, 1.093750, 0 } },
   { "NIKON", "D300", Cloudy, -5,               { 1.789063, 1, 1.105469, 0 } },
   { "NIKON", "D300", Cloudy, -4,               { 1.761719, 1, 1.117188, 0 } },
   { "NIKON", "D300", Cloudy, -3,               { 1.734375, 1, 1.132813, 0 } },
-  { "NIKON", "D300", Cloudy, -2,               { 1.710937, 1, 1.148437, 0 } },
+  { "NIKON", "D300", Cloudy, -2,               { 1.710938, 1, 1.148438, 0 } },
   { "NIKON", "D300", Cloudy, -1,               { 1.687500, 1, 1.167969, 0 } },
-  { "NIKON", "D300", Cloudy, 0,                        { 1.664062, 1, 
1.187500, 0 } },
+  { "NIKON", "D300", Cloudy, 0,                        { 1.664063, 1, 
1.187500, 0 } },
   { "NIKON", "D300", Cloudy, 1,                        { 1.644531, 1, 
1.207031, 0 } },
   { "NIKON", "D300", Cloudy, 2,                        { 1.625000, 1, 
1.230469, 0 } },
   { "NIKON", "D300", Cloudy, 3,                        { 1.601563, 1, 
1.253906, 0 } },
   { "NIKON", "D300", Cloudy, 4,                        { 1.582031, 1, 
1.281250, 0 } },
   { "NIKON", "D300", Cloudy, 5,                        { 1.562500, 1, 
1.308594, 0 } },
-  { "NIKON", "D300", Cloudy, 6,                        { 1.542969, 1, 
1.335937, 0 } },
+  { "NIKON", "D300", Cloudy, 6,                        { 1.542969, 1, 
1.335938, 0 } },
   { "NIKON", "D300", Shade, -6,                        { 2.156250, 1, 
1.000000, 0 } },
   { "NIKON", "D300", Shade, -5,                        { 2.109375, 1, 
1.000000, 0 } },
   { "NIKON", "D300", Shade, -4,                        { 2.062500, 1, 
1.011719, 0 } },
@@ -1814,27 +1813,25 @@
   { "NIKON", "D300", Shade, -2,                        { 1.976563, 1, 
1.042969, 0 } },
   { "NIKON", "D300", Shade, -1,                        { 1.937500, 1, 
1.054688, 0 } },
   { "NIKON", "D300", Shade, 0,                 { 1.902344, 1, 1.066406, 0 } },
-  { "NIKON", "D300", Shade, 1,                 { 1.867187, 1, 1.074219, 0 } },
+  { "NIKON", "D300", Shade, 1,                 { 1.867188, 1, 1.074219, 0 } },
   { "NIKON", "D300", Shade, 2,                 { 1.832031, 1, 1.085938, 0 } },
   { "NIKON", "D300", Shade, 3,                 { 1.804688, 1, 1.097656, 0 } },
   { "NIKON", "D300", Shade, 4,                 { 1.773438, 1, 1.113281, 0 } },
   { "NIKON", "D300", Shade, 5,                 { 1.746094, 1, 1.125000, 0 } },
   { "NIKON", "D300", Shade, 6,                 { 1.722656, 1, 1.140625, 0 } },
-
-  /* D300 Kelvin presets */
-  { "NIKON", "D300", "2500K", 0,               { 1.000000, 1, 2.632813, 0 } },
-  { "NIKON", "D300", "2560K", 0,               { 1.000000, 1, 2.550781, 0 } },
-  { "NIKON", "D300", "2630K", 0,               { 1.000000, 1, 2.468750, 0 } },
-  { "NIKON", "D300", "2700K", 0,               { 1.000000, 1, 2.390625, 0 } },
-  { "NIKON", "D300", "2780K", 0,               { 1.000000, 1, 2.312500, 0 } },
-  { "NIKON", "D300", "2860K", 0,               { 1.000000, 1, 2.234375, 0 } },
+  { "NIKON", "D300", "2500K", 0,               { 0.894531, 1, 2.632813, 0 } },
+  { "NIKON", "D300", "2560K", 0,               { 0.906250, 1, 2.550781, 0 } },
+  { "NIKON", "D300", "2630K", 0,               { 0.921875, 1, 2.468750, 0 } },
+  { "NIKON", "D300", "2700K", 0,               { 0.941406, 1, 2.390625, 0 } },
+  { "NIKON", "D300", "2780K", 0,               { 0.960938, 1, 2.312500, 0 } },
+  { "NIKON", "D300", "2860K", 0,               { 0.980469, 1, 2.234375, 0 } },
   { "NIKON", "D300", "2940K", 0,               { 1.003906, 1, 2.160156, 0 } },
   { "NIKON", "D300", "3030K", 0,               { 1.027344, 1, 2.085938, 0 } },
   { "NIKON", "D300", "3130K", 0,               { 1.050781, 1, 2.015625, 0 } },
-  { "NIKON", "D300", "3230K", 0,               { 1.078125, 1, 1.945312, 0 } },
+  { "NIKON", "D300", "3230K", 0,               { 1.078125, 1, 1.945313, 0 } },
   { "NIKON", "D300", "3330K", 0,               { 1.109375, 1, 1.875000, 0 } },
   { "NIKON", "D300", "3450K", 0,               { 1.136719, 1, 1.808594, 0 } },
-  { "NIKON", "D300", "3570K", 0,               { 1.167969, 1, 1.742187, 0 } },
+  { "NIKON", "D300", "3570K", 0,               { 1.167969, 1, 1.742188, 0 } },
   { "NIKON", "D300", "3700K", 0,               { 1.203125, 1, 1.679688, 0 } },
   { "NIKON", "D300", "3850K", 0,               { 1.238281, 1, 1.617188, 0 } },
   { "NIKON", "D300", "4000K", 0,               { 1.277344, 1, 1.554688, 0 } },
@@ -1849,7 +1846,7 @@
   { "NIKON", "D300", "6250K", 0,               { 1.695313, 1, 1.160156, 0 } },
   { "NIKON", "D300", "6670K", 0,               { 1.746094, 1, 1.125000, 0 } },
   { "NIKON", "D300", "7140K", 0,               { 1.804688, 1, 1.097656, 0 } },
-  { "NIKON", "D300", "7690K", 0,               { 1.867187, 1, 1.074219, 0 } },
+  { "NIKON", "D300", "7690K", 0,               { 1.867188, 1, 1.074219, 0 } },
   { "NIKON", "D300", "8330K", 0,               { 1.937500, 1, 1.054688, 0 } },
   { "NIKON", "D300", "9090K", 0,               { 2.019531, 1, 1.027344, 0 } },
   { "NIKON", "D300", "10000K", 0,              { 2.109375, 1, 1.000000, 0 } },


------------------------------------------------------------------------------
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
ufraw-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs

Reply via email to