Update of /cvsroot/ufraw/ufraw
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv15119
Modified Files:
wb_presets.c
Log Message:
WB presets + fine tuning + Kelvin for the Nikon D3X. Patch by Steffan Kaminski.
Index: wb_presets.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/wb_presets.c,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -d -r1.142 -r1.143
--- wb_presets.c 27 Jan 2010 21:23:22 -0000 1.142
+++ wb_presets.c 9 Feb 2010 03:38:00 -0000 1.143
@@ -1129,6 +1129,95 @@
{ "NIKON", "D3", "9090K", 0, { 2.38281, 1, 1.03515, 0 } },
{ "NIKON", "D3", "10000K", 0, { 2.48046, 1, 1.00000,
0 } },
+ /* D3X with firmware A 1.00 and B 1.01 */
+ { "NIKON", "D3X", Incandescent, -4, { 1.441406, 1, 2.125000, 0 } },
+ { "NIKON", "D3X", Incandescent, -3, { 1.421875, 1, 2.167969, 0 } },
+ { "NIKON", "D3X", Incandescent, -2, { 1.402344, 1, 2.210938, 0 } },
+ { "NIKON", "D3X", Incandescent, -1, { 1.382813, 1, 2.250000, 0 } },
+ { "NIKON", "D3X", Incandescent, 0, { 1.367188, 1, 2.292969, 0 } },
+ { "NIKON", "D3X", Incandescent, 1, { 1.351563, 1, 2.332031, 0 } },
+ { "NIKON", "D3X", Incandescent, 2, { 1.332031, 1, 2.371093, 0 } },
+ { "NIKON", "D3X", Incandescent, 3, { 1.316406, 1, 2.414063, 0 } },
+ { "NIKON", "D3X", Incandescent, 4, { 1.300781, 1, 2.457031, 0 } },
+ { "NIKON", "D3X", Fluorescent, -4, { 2.183594, 1, 1.980469, 0 } },
+ { "NIKON", "D3X", Fluorescent, -3, { 2.136719, 1, 2.015625, 0 } },
+ { "NIKON", "D3X", Fluorescent, -2, { 2.089844, 1, 2.054688, 0 } },
+ { "NIKON", "D3X", Fluorescent, -1, { 2.039064, 1, 2.089844, 0 } },
+ { "NIKON", "D3X", Fluorescent, 0, { 1.984375, 1, 2.128906, 0 } },
+ { "NIKON", "D3X", Fluorescent, 1, { 1.929688, 1, 2.167969, 0 } },
+ { "NIKON", "D3X", Fluorescent, 2, { 1.875000, 1, 2.207031, 0 } },
+ { "NIKON", "D3X", Fluorescent, 3, { 1.816406, 1, 2.246094, 0 } },
+ { "NIKON", "D3X", Fluorescent, 4, { 1.753906, 1, 2.292969, 0 } },
+ { "NIKON", "D3X", DirectSunlight, -4, { 2.289063, 1,
1.308594, 0 } },
+ { "NIKON", "D3X", DirectSunlight, -3, { 2.253906, 1,
1.335938, 0 } },
+ { "NIKON", "D3X", DirectSunlight, -2, { 2.222656, 1,
1.359375, 0 } },
+ { "NIKON", "D3X", DirectSunlight, -1, { 2.187500, 1,
1.386719, 0 } },
+ { "NIKON", "D3X", DirectSunlight, 0, { 2.156250, 1, 1.417969, 0 } },
+ { "NIKON", "D3X", DirectSunlight, 1, { 2.125000, 1, 1.445313, 0 } },
+ { "NIKON", "D3X", DirectSunlight, 2, { 2.093750, 1, 1.472656, 0 } },
+ { "NIKON", "D3X", DirectSunlight, 3, { 2.062500, 1, 1.496094, 0 } },
+ { "NIKON", "D3X", DirectSunlight, 4, { 2.027344, 1, 1.519531, 0 } },
+ { "NIKON", "D3X", Flash, -4, { 2.566406, 1, 1.183594, 0 } },
+ { "NIKON", "D3X", Flash, -3, { 2.523438, 1, 1.199219, 0 } },
+ { "NIKON", "D3X", Flash, -2, { 2.484375, 1, 1.214844, 0 } },
+ { "NIKON", "D3X", Flash, -1, { 2.445313, 1, 1.226563, 0 } },
+ { "NIKON", "D3X", Flash, 0, { 2.402344, 1, 1.242187, 0 } },
+ { "NIKON", "D3X", Flash, 1, { 2.371094, 1, 1.257813, 0 } },
+ { "NIKON", "D3X", Flash, 2, { 2.343750, 1, 1.273438, 0 } },
+ { "NIKON", "D3X", Flash, 3, { 2.320313, 1, 1.292969, 0 } },
+ { "NIKON", "D3X", Flash, 4, { 2.289063, 1, 1.308594, 0 } },
+ { "NIKON", "D3X", Cloudy, -4, { 2.488281, 1,
1.214844, 0 } },
+ { "NIKON", "D3X", Cloudy, -3, { 2.445313, 1,
1.230469, 0 } },
+ { "NIKON", "D3X", Cloudy, -2, { 2.406250, 1,
1.250000, 0 } },
+ { "NIKON", "D3X", Cloudy, -1, { 2.363281, 1,
1.265625, 0 } },
+ { "NIKON", "D3X", Cloudy, 0, { 2.328125, 1, 1.289062, 0 } },
+ { "NIKON", "D3X", Cloudy, 1, { 2.289063, 1, 1.308594, 0 } },
+ { "NIKON", "D3X", Cloudy, 2, { 2.253906, 1, 1.335938, 0 } },
+ { "NIKON", "D3X", Cloudy, 3, { 2.222656, 1, 1.359375, 0 } },
+ { "NIKON", "D3X", Cloudy, 4, { 2.187500, 1, 1.386719, 0 } },
+ { "NIKON", "D3X", Shade, -4, { 2.937500, 1, 1.089844, 0 } },
+ { "NIKON", "D3X", Shade, -3, { 2.878906, 1, 1.113281, 0 } },
+ { "NIKON", "D3X", Shade, -2, { 2.820313, 1, 1.128906, 0 } },
+ { "NIKON", "D3X", Shade, -1, { 2.761719, 1, 1.144531, 0 } },
+ { "NIKON", "D3X", Shade, 0, { 2.707031, 1, 1.160156, 0 } },
+ { "NIKON", "D3X", Shade, 1, { 2.652344, 1, 1.171875, 0 } },
+ { "NIKON", "D3X", Shade, 2, { 2.601563, 1, 1.183594, 0 } },
+ { "NIKON", "D3X", Shade, 3, { 2.554688, 1, 1.199219, 0 } },
+ { "NIKON", "D3X", Shade, 4, { 2.507813, 1, 1.210938, 0 } },
+
+ /* D3X Kelvin presets */
+ { "NIKON", "D3X", "2500K", 0, { 1.179688, 1,
2.898438, 0 } },
+ { "NIKON", "D3X", "2560K", 0, { 1.203125, 1,
2.796875, 0 } },
+ { "NIKON", "D3X", "2630K", 0, { 1.226563, 1,
2.699219, 0 } },
+ { "NIKON", "D3X", "2700K", 0, { 1.253906, 1,
2.605469, 0 } },
+ { "NIKON", "D3X", "2780K", 0, { 1.281250, 1,
2.519531, 0 } },
+ { "NIKON", "D3X", "2860K", 0, { 1.312500, 1,
2.429688, 0 } },
+ { "NIKON", "D3X", "2940K", 0, { 1.343750, 1,
2.347656, 0 } },
+ { "NIKON", "D3X", "3030K", 0, { 1.378906, 1,
2.269531, 0 } },
+ { "NIKON", "D3X", "3130K", 0, { 1.414063, 1,
2.187500, 0 } },
+ { "NIKON", "D3X", "3230K", 0, { 1.453125, 1,
2.097656, 0 } },
+ { "NIKON", "D3X", "3330K", 0, { 1.492187, 1,
2.015625, 0 } },
+ { "NIKON", "D3X", "3450K", 0, { 1.539062, 1,
1.933594, 0 } },
+ { "NIKON", "D3X", "3570K", 0, { 1.585937, 1,
1.859375, 0 } },
+ { "NIKON", "D3X", "3700K", 0, { 1.636719, 1,
1.792969, 0 } },
+ { "NIKON", "D3X", "3850K", 0, { 1.695312, 1,
1.734375, 0 } },
+ { "NIKON", "D3X", "4000K", 0, { 1.753906, 1,
1.683594, 0 } },
+ { "NIKON", "D3X", "4170K", 0, { 1.824219, 1,
1.636719, 0 } },
+ { "NIKON", "D3X", "4350K", 0, { 1.902344, 1,
1.593750, 0 } },
+ { "NIKON", "D3X", "4550K", 0, { 1.976562, 1,
1.554687, 0 } },
+ { "NIKON", "D3X", "4760K", 0, { 2.042969, 1,
1.511719, 0 } },
+ { "NIKON", "D3X", "5000K", 0, { 2.105469, 1,
1.460938, 0 } },
+ { "NIKON", "D3X", "5260K", 0, { 2.167969, 1,
1.406250, 0 } },
+ { "NIKON", "D3X", "5560K", 0, { 2.234375, 1,
1.351563, 0 } },
+ { "NIKON", "D3X", "5880K", 0, { 2.304688, 1,
1.300781, 0 } },
+ { "NIKON", "D3X", "6250K", 0, { 2.378906, 1,
1.257813, 0 } },
+ { "NIKON", "D3X", "6670K", 0, { 2.464844, 1,
1.226562, 0 } },
+ { "NIKON", "D3X", "7140K", 0, { 2.554687, 1,
1.199219, 0 } },
+ { "NIKON", "D3X", "7690K", 0, { 2.652344, 1,
1.171875, 0 } },
+ { "NIKON", "D3X", "8330K", 0, { 2.761719, 1,
1.144531, 0 } },
+ { "NIKON", "D3X", "9090K", 0, { 2.878906, 1,
1.113281, 0 } },
+ { "NIKON", "D3X", "10000K", 0, { 3.000000, 1, 1.062500, 0 } },
+
/* 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 } },
------------------------------------------------------------------------------
The Planet: dedicated and managed hosting, cloud storage, colocation
Stay online with enterprise data centers and the best network in the business
Choose flexible plans and management services without long-term contracts
Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com
_______________________________________________
ufraw-cvs mailing list
ufraw-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs
