Update of /cvsroot/ufraw/ufraw
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv10832
Modified Files:
wb_presets.c
Log Message:
Update WB presets and fine tuning for the NIKON D70s.
Index: wb_presets.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/wb_presets.c,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -d -r1.143 -r1.144
--- wb_presets.c 9 Feb 2010 03:38:00 -0000 1.143
+++ wb_presets.c 12 Feb 2010 14:45:15 -0000 1.144
@@ -962,49 +962,6 @@
{ "NIKON", "D1X", Shade, 2, { 2.500000, 1, 1.035156, 0 } },
/*7100K*/
{ "NIKON", "D1X", Shade, 3, { 2.441406, 1, 1.046875, 0 } },
/*6700K*/
- { "NIKON", "D100", Incandescent, -3, { 1.527344, 1, 2.539062, 0 } },
/*3300K*/
- { "NIKON", "D100", Incandescent, -2, { 1.476562, 1, 2.656250, 0 } },
/*3200K*/
- { "NIKON", "D100", Incandescent, -1, { 1.457031, 1, 2.707031, 0 } },
/*3100K*/
- { "NIKON", "D100", Incandescent, 0, { 1.406250, 1, 2.828125, 0 } },
/*3000K*/
- { "NIKON", "D100", Incandescent, 1, { 1.367188, 1, 2.937500, 0 } },
/*2900K*/
- { "NIKON", "D100", Incandescent, 2, { 1.316406, 1, 3.046875, 0 } },
/*2800K*/
- { "NIKON", "D100", Incandescent, 3, { 1.269531, 1, 3.167969, 0 } },
/*2700K*/
- { "NIKON", "D100", Fluorescent, -3, { 3.148438, 1, 1.847656, 0 } },
/*7200K*/
- { "NIKON", "D100", Fluorescent, -2, { 2.609375, 1, 1.617187, 0 } },
/*6500K*/
- { "NIKON", "D100", Fluorescent, -1, { 2.250000, 1, 2.039062, 0 } },
/*5000K*/
- { "NIKON", "D100", Fluorescent, 0, { 2.058594, 1, 2.617187, 0 } },
/*4200K*/
- { "NIKON", "D100", Fluorescent, 1, { 1.886719, 1, 2.726562, 0 } },
/*3700K*/
- { "NIKON", "D100", Fluorescent, 2, { 1.429688, 1, 3.359375, 0 } },
/*3000K*/
- { "NIKON", "D100", Fluorescent, 3, { 1.250000, 1, 2.699219, 0 } },
/*2700K*/
- { "NIKON", "D100", DirectSunlight, -3, { 2.386719, 1, 1.687500, 0 } },
/*5600K*/
- { "NIKON", "D100", DirectSunlight, -2, { 2.316406, 1, 1.726563, 0 } },
/*5400K*/
- { "NIKON", "D100", DirectSunlight, -1, { 2.296875, 1, 1.738281, 0 } },
/*5300K*/
- { "NIKON", "D100", DirectSunlight, 0, { 2.257812, 1,
1.757812, 0 } }, /*5200K*/
- { "NIKON", "D100", DirectSunlight, 1, { 2.187500, 1,
1.796875, 0 } }, /*5000K*/
- { "NIKON", "D100", DirectSunlight, 2, { 2.156250, 1,
1.816406, 0 } }, /*4900K*/
- { "NIKON", "D100", DirectSunlight, 3, { 2.117187, 1,
1.847656, 0 } }, /*4800K*/
- { "NIKON", "D100", Flash, -3, { 2.718750, 1,
1.519531, 0 } }, /*6000K*/
- { "NIKON", "D100", Flash, -2, { 2.656250, 1,
1.527344, 0 } }, /*5800K*/
- { "NIKON", "D100", Flash, -1, { 2.597656, 1,
1.527344, 0 } }, /*5600K*/
- { "NIKON", "D100", Flash, 0, { 2.539062, 1, 1.539062, 0 } },
/*5400K*/
- { "NIKON", "D100", Flash, 1, { 2.476562, 1, 1.539062, 0 } },
/*5200K*/
- { "NIKON", "D100", Flash, 2, { 2.437500, 1, 1.546875, 0 } },
/*5000K*/
- { "NIKON", "D100", Flash, 3, { 2.398438, 1, 1.546875, 0 } },
/*4800K*/
- { "NIKON", "D100", Cloudy, -3, { 2.648438, 1, 1.558594, 0 } },
/*6600K*/
- { "NIKON", "D100", Cloudy, -2, { 2.609375, 1, 1.578125, 0 } },
/*6400K*/
- { "NIKON", "D100", Cloudy, -1, { 2.558594, 1, 1.597656, 0 } },
/*6200K*/
- { "NIKON", "D100", Cloudy, 0, { 2.507813, 1,
1.628906, 0 } }, /*6000K*/
- { "NIKON", "D100", Cloudy, 1, { 2.449219, 1,
1.656250, 0 } }, /*5800K*/
- { "NIKON", "D100", Cloudy, 2, { 2.398438, 1,
1.687500, 0 } }, /*5600K*/
- { "NIKON", "D100", Cloudy, 3, { 2.316406, 1,
1.726563, 0 } }, /*5400K*/
- { "NIKON", "D100", Shade, -3, { 3.046875, 1,
1.386719, 0 } }, /*9200K*/
- { "NIKON", "D100", Shade, -2, { 3.000000, 1,
1.406250, 0 } }, /*8800K*/
- { "NIKON", "D100", Shade, -1, { 2.957031, 1,
1.417969, 0 } }, /*8400K*/
- { "NIKON", "D100", Shade, 0, { 2.906250, 1, 1.437500, 0 } },
/*8000K*/
- { "NIKON", "D100", Shade, 1, { 2.816406, 1, 1.476562, 0 } },
/*7500K*/
- { "NIKON", "D100", Shade, 2, { 2.750000, 1, 1.519531, 0 } },
/*7100K*/
- { "NIKON", "D100", Shade, 3, { 2.667969, 1, 1.546875, 0 } },
/*6700K*/
-
/*
* D2X with firmware A 1.01 and B 1.01
*/
@@ -1218,6 +1175,49 @@
{ "NIKON", "D3X", "9090K", 0, { 2.878906, 1,
1.113281, 0 } },
{ "NIKON", "D3X", "10000K", 0, { 3.000000, 1, 1.062500, 0 } },
+ { "NIKON", "D100", Incandescent, -3, { 1.527344, 1, 2.539062, 0 } },
/*3300K*/
+ { "NIKON", "D100", Incandescent, -2, { 1.476562, 1, 2.656250, 0 } },
/*3200K*/
+ { "NIKON", "D100", Incandescent, -1, { 1.457031, 1, 2.707031, 0 } },
/*3100K*/
+ { "NIKON", "D100", Incandescent, 0, { 1.406250, 1, 2.828125, 0 } },
/*3000K*/
+ { "NIKON", "D100", Incandescent, 1, { 1.367188, 1, 2.937500, 0 } },
/*2900K*/
+ { "NIKON", "D100", Incandescent, 2, { 1.316406, 1, 3.046875, 0 } },
/*2800K*/
+ { "NIKON", "D100", Incandescent, 3, { 1.269531, 1, 3.167969, 0 } },
/*2700K*/
+ { "NIKON", "D100", Fluorescent, -3, { 3.148438, 1, 1.847656, 0 } },
/*7200K*/
+ { "NIKON", "D100", Fluorescent, -2, { 2.609375, 1, 1.617187, 0 } },
/*6500K*/
+ { "NIKON", "D100", Fluorescent, -1, { 2.250000, 1, 2.039062, 0 } },
/*5000K*/
+ { "NIKON", "D100", Fluorescent, 0, { 2.058594, 1, 2.617187, 0 } },
/*4200K*/
+ { "NIKON", "D100", Fluorescent, 1, { 1.886719, 1, 2.726562, 0 } },
/*3700K*/
+ { "NIKON", "D100", Fluorescent, 2, { 1.429688, 1, 3.359375, 0 } },
/*3000K*/
+ { "NIKON", "D100", Fluorescent, 3, { 1.250000, 1, 2.699219, 0 } },
/*2700K*/
+ { "NIKON", "D100", DirectSunlight, -3, { 2.386719, 1, 1.687500, 0 } },
/*5600K*/
+ { "NIKON", "D100", DirectSunlight, -2, { 2.316406, 1, 1.726563, 0 } },
/*5400K*/
+ { "NIKON", "D100", DirectSunlight, -1, { 2.296875, 1, 1.738281, 0 } },
/*5300K*/
+ { "NIKON", "D100", DirectSunlight, 0, { 2.257812, 1,
1.757812, 0 } }, /*5200K*/
+ { "NIKON", "D100", DirectSunlight, 1, { 2.187500, 1,
1.796875, 0 } }, /*5000K*/
+ { "NIKON", "D100", DirectSunlight, 2, { 2.156250, 1,
1.816406, 0 } }, /*4900K*/
+ { "NIKON", "D100", DirectSunlight, 3, { 2.117187, 1,
1.847656, 0 } }, /*4800K*/
+ { "NIKON", "D100", Flash, -3, { 2.718750, 1,
1.519531, 0 } }, /*6000K*/
+ { "NIKON", "D100", Flash, -2, { 2.656250, 1,
1.527344, 0 } }, /*5800K*/
+ { "NIKON", "D100", Flash, -1, { 2.597656, 1,
1.527344, 0 } }, /*5600K*/
+ { "NIKON", "D100", Flash, 0, { 2.539062, 1, 1.539062, 0 } },
/*5400K*/
+ { "NIKON", "D100", Flash, 1, { 2.476562, 1, 1.539062, 0 } },
/*5200K*/
+ { "NIKON", "D100", Flash, 2, { 2.437500, 1, 1.546875, 0 } },
/*5000K*/
+ { "NIKON", "D100", Flash, 3, { 2.398438, 1, 1.546875, 0 } },
/*4800K*/
+ { "NIKON", "D100", Cloudy, -3, { 2.648438, 1, 1.558594, 0 } },
/*6600K*/
+ { "NIKON", "D100", Cloudy, -2, { 2.609375, 1, 1.578125, 0 } },
/*6400K*/
+ { "NIKON", "D100", Cloudy, -1, { 2.558594, 1, 1.597656, 0 } },
/*6200K*/
+ { "NIKON", "D100", Cloudy, 0, { 2.507813, 1,
1.628906, 0 } }, /*6000K*/
+ { "NIKON", "D100", Cloudy, 1, { 2.449219, 1,
1.656250, 0 } }, /*5800K*/
+ { "NIKON", "D100", Cloudy, 2, { 2.398438, 1,
1.687500, 0 } }, /*5600K*/
+ { "NIKON", "D100", Cloudy, 3, { 2.316406, 1,
1.726563, 0 } }, /*5400K*/
+ { "NIKON", "D100", Shade, -3, { 3.046875, 1,
1.386719, 0 } }, /*9200K*/
+ { "NIKON", "D100", Shade, -2, { 3.000000, 1,
1.406250, 0 } }, /*8800K*/
+ { "NIKON", "D100", Shade, -1, { 2.957031, 1,
1.417969, 0 } }, /*8400K*/
+ { "NIKON", "D100", Shade, 0, { 2.906250, 1, 1.437500, 0 } },
/*8000K*/
+ { "NIKON", "D100", Shade, 1, { 2.816406, 1, 1.476562, 0 } },
/*7500K*/
+ { "NIKON", "D100", Shade, 2, { 2.750000, 1, 1.519531, 0 } },
/*7100K*/
+ { "NIKON", "D100", Shade, 3, { 2.667969, 1, 1.546875, 0 } },
/*6700K*/
+
/* D200 basic + fine tune WB presets */
{ "NIKON", "D200", Incandescent, -2, { 1.199219, 1, 2.238281, 0 } },
{ "NIKON", "D200", Incandescent, -1, { 1.183594, 1, 2.289063, 0 } },
@@ -1652,23 +1652,47 @@
{ "NIKON", "D70", Shade, 0, { 2.613281, 1, 1.277344, 0 } },
/*8000K*/
{ "NIKON", "D70", Shade, 3, { 2.394531, 1, 1.375000, 0 } },
- { "NIKON", "D70s", Incandescent, -3, { 1.429688, 1, 2.539062, 0 } },
- { "NIKON", "D70s", Incandescent, 0, { 1.343750, 1, 2.816406, 0 } },
/*3000K*/
+ { "NIKON", "D70s", Incandescent, -3, { 1.429688, 1, 2.539063, 0 } },
+ { "NIKON", "D70s", Incandescent, -2, { 1.398438, 1, 2.632813, 0 } },
+ { "NIKON", "D70s", Incandescent, -1, { 1.378906, 1, 2.687500, 0 } },
+ { "NIKON", "D70s", Incandescent, 0, { 1.343750, 1, 2.816406, 0 } },
+ { "NIKON", "D70s", Incandescent, 1, { 1.312500, 1, 2.937500, 0 } },
+ { "NIKON", "D70s", Incandescent, 2, { 1.281250, 1, 3.089844, 0 } },
{ "NIKON", "D70s", Incandescent, 3, { 1.253906, 1, 3.250000, 0 } },
{ "NIKON", "D70s", Fluorescent, -3, { 2.734375, 1, 1.621094, 0 } },
- { "NIKON", "D70s", Fluorescent, 0, { 1.964844, 1, 2.476563, 0 } },
/*4200K*/
+ { "NIKON", "D70s", Fluorescent, -2, { 2.417969, 1, 1.343750, 0 } },
+ { "NIKON", "D70s", Fluorescent, -1, { 2.078125, 1, 1.691406, 0 } },
+ { "NIKON", "D70s", Fluorescent, 0, { 1.964844, 1, 2.476563, 0 } },
+ { "NIKON", "D70s", Fluorescent, 1, { 1.566406, 1, 2.753906, 0 } },
+ { "NIKON", "D70s", Fluorescent, 2, { 1.406250, 1, 2.550781, 0 } },
{ "NIKON", "D70s", Fluorescent, 3, { 1.312500, 1, 2.562500, 0 } },
{ "NIKON", "D70s", DirectSunlight, -3, { 2.156250, 1, 1.523438, 0 } },
- { "NIKON", "D70s", DirectSunlight, 0, { 2.062500, 1,
1.597656, 0 } }, /*5200K*/
- { "NIKON", "D70s", DirectSunlight, 3, { 1.953125, 1,
1.695312, 0 } },
- { "NIKON", "D70s", Flash, -3, { 2.578125, 1,
1.476562, 0 } },
- { "NIKON", "D70s", Flash, 0, { 2.441406, 1, 1.500000, 0 } },
/*5400K*/
+ { "NIKON", "D70s", DirectSunlight, -2, { 2.109375, 1, 1.562500, 0 } },
+ { "NIKON", "D70s", DirectSunlight, -1, { 2.089844, 1, 1.574219, 0 } },
+ { "NIKON", "D70s", DirectSunlight, 0, { 2.062500, 1,
1.597656, 0 } },
+ { "NIKON", "D70s", DirectSunlight, 1, { 2.007813, 1,
1.648438, 0 } },
+ { "NIKON", "D70s", DirectSunlight, 2, { 1.980469, 1,
1.671875, 0 } },
+ { "NIKON", "D70s", DirectSunlight, 3, { 1.953125, 1,
1.695313, 0 } },
+ { "NIKON", "D70s", Flash, -3, { 2.578125, 1,
1.476563, 0 } },
+ { "NIKON", "D70s", Flash, -2, { 2.535156, 1,
1.484375, 0 } },
+ { "NIKON", "D70s", Flash, -1, { 2.488281, 1,
1.492188, 0 } },
+ { "NIKON", "D70s", Flash, 0, { 2.441406, 1, 1.500000, 0 } },
+ { "NIKON", "D70s", Flash, 1, { 2.421875, 1, 1.507813, 0 } },
+ { "NIKON", "D70s", Flash, 2, { 2.398438, 1, 1.515625, 0 } },
{ "NIKON", "D70s", Flash, 3, { 2.378906, 1, 1.523438, 0 } },
{ "NIKON", "D70s", Cloudy, -3, { 2.375000, 1, 1.386719, 0 } },
- { "NIKON", "D70s", Cloudy, 0, { 2.257813, 1,
1.457031, 0 } }, /*6000K*/
+ { "NIKON", "D70s", Cloudy, -2, { 2.343750, 1, 1.406250, 0 } },
+ { "NIKON", "D70s", Cloudy, -1, { 2.300781, 1, 1.429688, 0 } },
+ { "NIKON", "D70s", Cloudy, 0, { 2.257813, 1,
1.457031, 0 } },
+ { "NIKON", "D70s", Cloudy, 1, { 2.207031, 1,
1.488281, 0 } },
+ { "NIKON", "D70s", Cloudy, 2, { 2.156250, 1,
1.523438, 0 } },
{ "NIKON", "D70s", Cloudy, 3, { 2.109375, 1,
1.562500, 0 } },
- { "NIKON", "D70s", Shade, -3, { 2.757812, 1,
1.226562, 0 } },
- { "NIKON", "D70s", Shade, 0, { 2.613281, 1, 1.277344, 0 } },
/*8000K*/
+ { "NIKON", "D70s", Shade, -3, { 2.757813, 1,
1.226563, 0 } },
+ { "NIKON", "D70s", Shade, -2, { 2.710938, 1,
1.242188, 0 } },
+ { "NIKON", "D70s", Shade, -1, { 2.660156, 1,
1.257813, 0 } },
+ { "NIKON", "D70s", Shade, 0, { 2.613281, 1, 1.277344, 0 } },
+ { "NIKON", "D70s", Shade, 1, { 2.531250, 1, 1.308594, 0 } },
+ { "NIKON", "D70s", Shade, 2, { 2.472656, 1, 1.335938, 0 } },
{ "NIKON", "D70s", Shade, 3, { 2.394531, 1, 1.375000, 0 } },
{ "NIKON", "D80", Incandescent, -3, { 1.234375, 1, 2.140625, 0 } },
------------------------------------------------------------------------------
SOLARIS 10 is the OS for Data Centers - provides features such as DTrace,
Predictive Self Healing and Award Winning ZFS. Get Solaris 10 NOW
http://p.sf.net/sfu/solaris-dev2dev
_______________________________________________
ufraw-cvs mailing list
ufraw-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs
