Update of /cvsroot/ufraw/ufraw
In directory vz-cvs-3.sog:/tmp/cvs-serv32669
Modified Files:
wb_presets.c
Log Message:
Add WB presets for the NIKON D800 \(stolen from Darktable\) and WB and Kelvin
presets for the NIKON D4.
Index: wb_presets.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/wb_presets.c,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -d -r1.208 -r1.209
--- wb_presets.c 23 Apr 2012 18:00:12 -0000 1.208
+++ wb_presets.c 27 Apr 2012 16:30:25 -0000 1.209
@@ -1961,6 +1961,48 @@
{ "NIKON", "D3X", "9090K", 0, { 2.878906, 1,
1.113281, 0 } },
{ "NIKON", "D3X", "10000K", 0, { 3.000000, 1, 1.062500, 0 } },
+ { "NIKON", "D4", Incandescent, 0, { 1.281250, 1, 2.371094, 0 } },
+ { "NIKON", "D4", SodiumVaporFluorescent, 0, { 1.195313, 1, 2.589844, 0 } },
+ { "NIKON", "D4", WarmWhiteFluorescent, 0, { 1.277344, 1, 2.109375, 0 } },
+ { "NIKON", "D4", WhiteFluorescent, 0, { 1.488281, 1,
2.476563, 0 } },
+ { "NIKON", "D4", CoolWhiteFluorescent, 0, { 1.855469, 1, 2.156250, 0 } },
+ { "NIKON", "D4", DayWhiteFluorescent, 0, { 1.867188, 1, 1.476563, 0 } },
+ { "NIKON", "D4", DaylightFluorescent, 0, { 2.132813, 1, 1.156250, 0 } },
+ { "NIKON", "D4", HighTempMercuryVaporFluorescent, 0, { 2.546875, 1,
1.425781, 0 } },
+ { "NIKON", "D4", DirectSunlight, 0, { 2.019531, 1, 1.437500, 0 } },
+ { "NIKON", "D4", Flash, 0, { 2.300781, 1, 1.253906, 0 } },
+ { "NIKON", "D4", Cloudy, 0, { 2.175781, 1, 1.300781, 0 } },
+ { "NIKON", "D4", Shade, 0, { 2.511719, 1, 1.164063, 0 } },
+ { "NIKON", "D4", "2500K", 0, { 1.097656, 1, 3.027344, 0 } },
+ { "NIKON", "D4", "2600K", 0, { 1.132813, 1, 2.859375, 0 } },
+ { "NIKON", "D4", "2700K", 0, { 1.167969, 1, 2.710938, 0 } },
+ { "NIKON", "D4", "2800K", 0, { 1.207031, 1, 2.582031, 0 } },
+ { "NIKON", "D4", "2900K", 0, { 1.246094, 1, 2.464844, 0 } },
+ { "NIKON", "D4", "3000K", 0, { 1.281250, 1, 2.363281, 0 } },
+ { "NIKON", "D4", "3200K", 0, { 1.355469, 1, 2.195313, 0 } },
+ { "NIKON", "D4", "3400K", 0, { 1.425781, 1, 2.054688, 0 } },
+ { "NIKON", "D4", "3600K", 0, { 1.496094, 1, 1.929688, 0 } },
+ { "NIKON", "D4", "3800K", 0, { 1.558594, 1, 1.812500, 0 } },
+ { "NIKON", "D4", "4000K", 0, { 1.628906, 1, 1.718750, 0 } },
+ { "NIKON", "D4", "4200K", 0, { 1.703125, 1, 1.660156, 0 } },
+ { "NIKON", "D4", "4400K", 0, { 1.781250, 1, 1.621094, 0 } },
+ { "NIKON", "D4", "4600K", 0, { 1.859375, 1, 1.589844, 0 } },
+ { "NIKON", "D4", "4800K", 0, { 1.921875, 1, 1.539063, 0 } },
+ { "NIKON", "D4", "5000K", 0, { 1.972656, 1, 1.488281, 0 } },
+ { "NIKON", "D4", "5300K", 0, { 2.039063, 1, 1.417969, 0 } },
+ { "NIKON", "D4", "5600K", 0, { 2.097656, 1, 1.359375, 0 } },
+ { "NIKON", "D4", "5900K", 0, { 2.152344, 1, 1.308594, 0 } },
+ { "NIKON", "D4", "6200K", 0, { 2.207031, 1, 1.273438, 0 } },
+ { "NIKON", "D4", "6500K", 0, { 2.261719, 1, 1.242188, 0 } },
+ { "NIKON", "D4", "6800K", 0, { 2.312500, 1, 1.222656, 0 } },
+ { "NIKON", "D4", "7100K", 0, { 2.363281, 1, 1.203125, 0 } },
+ { "NIKON", "D4", "7500K", 0, { 2.433594, 1, 1.183594, 0 } },
+ { "NIKON", "D4", "8000K", 0, { 2.511719, 1, 1.160156, 0 } },
+ { "NIKON", "D4", "8500K", 0, { 2.589844, 1, 1.140625, 0 } },
+ { "NIKON", "D4", "9000K", 0, { 2.660156, 1, 1.117188, 0 } },
+ { "NIKON", "D4", "9500K", 0, { 2.730469, 1, 1.093750, 0 } },
+ { "NIKON", "D4", "10000K", 0, { 2.792969, 1,
1.066406, 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*/
@@ -2372,6 +2414,13 @@
{ "NIKON", "D700", "9090K", 0, { 2.382812, 1, 1.035156, 0 } },
{ "NIKON", "D700", "10000K", 0, { 2.480469, 1, 1.000000, 0 } },
+ { "NIKON", "D800", Incandescent, 0, { 1.289063, 1, 2.175781, 0 } },
+ { "NIKON", "D800", CoolWhiteFluorescent, 0, { 1.765625, 1, 2.003906, 0 } },
+ { "NIKON", "D800", DirectSunlight, 0, { 1.972656, 1,
1.375000, 0 } },
+ { "NIKON", "D800", Flash, 0, { 2.187500, 1, 1.207031, 0 } },
+ { "NIKON", "D800", Cloudy, 0, { 2.101563, 1,
1.253906, 0 } },
+ { "NIKON", "D800", Shade, 0, { 2.378906, 1, 1.128906, 0 } },
+
{ "NIKON", "D40", Incandescent, -3, { 1.492188, 1, 2.164063, 0 } },
{ "NIKON", "D40", Incandescent, -2, { 1.437500, 1, 2.367188, 0 } },
{ "NIKON", "D40", Incandescent, -1, { 1.417969, 1, 2.414062, 0 } },
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
ufraw-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs
