Update of /cvsroot/ufraw/ufraw
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv10214
Modified Files:
wb_presets.c
Log Message:
Add WB presets for Canon EOS-1Ds Mark II and EOS-1D Mark IV. Update WB presets
for Canon EOS 5D Mark II.
Index: wb_presets.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/wb_presets.c,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -d -r1.163 -r1.164
--- wb_presets.c 28 Oct 2010 00:30:17 -0000 1.163
+++ wb_presets.c 10 Nov 2010 18:00:19 -0000 1.164
@@ -223,12 +223,121 @@
{ "Canon", "EOS 5D", Shade, 0, { 2.300781, 1, 1.208008, 0 } },
/*7200K*/
{ "Canon", "EOS 5D", Daylight, 0, { 1.988281, 1, 1.457031, 0 } },
/*5250K*/
- { "Canon", "EOS 5D Mark II", Daylight, 0, { 2.188477, 1, 1.686523, 0 } },
/*5200K*/
- { "Canon", "EOS 5D Mark II", Shade, 0, { 2.515625, 1, 1.391602, 0 } },
/*7000K*/
- { "Canon", "EOS 5D Mark II", Cloudy, 0, { 2.354492, 1, 1.519531, 0 } },
/*6000K*/
- { "Canon", "EOS 5D Mark II", Tungsten, 0, { 1.564033, 1, 2.665758, 0 } },
/*3200K*/
- { "Canon", "EOS 5D Mark II", Fluorescent, 0, { 1.877243, 1, 2.479698, 0 } },
/*4000K*/
- { "Canon", "EOS 5D Mark II", Flash, 0, { 2.370117, 1, 1.503906, 0 } },
/*5621K*/
+ /* Canon EOS 5D Mark II firmware 2.0.7 */
+ { "Canon", "EOS 5D Mark II", "Daylight", -9, { 1.954102, 1,
1.984375, 0 } },
+ { "Canon", "EOS 5D Mark II", "Daylight", -8, { 1.976563, 1,
1.954102, 0 } },
+ { "Canon", "EOS 5D Mark II", "Daylight", -7, { 2.003906, 1,
1.917969, 0 } },
+ { "Canon", "EOS 5D Mark II", "Daylight", -6, { 2.032227, 1,
1.885742, 0 } },
+ { "Canon", "EOS 5D Mark II", "Daylight", -5, { 2.060547, 1,
1.851563, 0 } },
+ { "Canon", "EOS 5D Mark II", "Daylight", -4, { 2.09375, 1,
1.818359, 0 } },
+ { "Canon", "EOS 5D Mark II", "Daylight", -3, { 2.120117, 1,
1.787109, 0 } },
+ { "Canon", "EOS 5D Mark II", "Daylight", -2, { 2.151367, 1,
1.756836, 0 } },
+ { "Canon", "EOS 5D Mark II", "Daylight", -1, { 2.183594, 1,
1.723633, 0 } },
+ { "Canon", "EOS 5D Mark II", "Daylight", 0, { 2.216797, 1,
1.689453, 0 } },
+ { "Canon", "EOS 5D Mark II", "Daylight", 1, { 2.250977, 1, 1.65918,
0 } },
+ { "Canon", "EOS 5D Mark II", "Daylight", 2, { 2.291016, 1, 1.62793,
0 } },
+ { "Canon", "EOS 5D Mark II", "Daylight", 3, { 2.327148, 1,
1.594727, 0 } },
+ { "Canon", "EOS 5D Mark II", "Daylight", 4, { 2.359375, 1,
1.563477, 0 } },
+ { "Canon", "EOS 5D Mark II", "Daylight", 5, { 2.392578, 1, 1.52832,
0 } },
+ { "Canon", "EOS 5D Mark II", "Daylight", 6, { 2.420898, 1,
1.503906, 0 } },
+ { "Canon", "EOS 5D Mark II", "Daylight", 7, { 2.450195, 1,
1.477539, 0 } },
+ { "Canon", "EOS 5D Mark II", "Daylight", 8, { 2.485352, 1,
1.450195, 0 } },
+ { "Canon", "EOS 5D Mark II", "Daylight", 9, { 2.52832, 1,
1.421875, 0 } },
+ { "Canon", "EOS 5D Mark II", "Shade", -9, { 2.250977, 1,
1.662109, 0 } },
+ { "Canon", "EOS 5D Mark II", "Shade", -8, { 2.286133, 1,
1.630859, 0 } },
+ { "Canon", "EOS 5D Mark II", "Shade", -7, { 2.322266, 1,
1.599609, 0 } },
+ { "Canon", "EOS 5D Mark II", "Shade", -6, { 2.354492, 1, 1.56543,
0 } },
+ { "Canon", "EOS 5D Mark II", "Shade", -5, { 2.386719, 1,
1.533203, 0 } },
+ { "Canon", "EOS 5D Mark II", "Shade", -4, { 2.415039, 1,
1.505859, 0 } },
+ { "Canon", "EOS 5D Mark II", "Shade", -3, { 2.450195, 1,
1.479492, 0 } },
+ { "Canon", "EOS 5D Mark II", "Shade", -2, { 2.485352, 1,
1.452148, 0 } },
+ { "Canon", "EOS 5D Mark II", "Shade", -1, { 2.522461, 1,
1.425781, 0 } },
+ { "Canon", "EOS 5D Mark II", "Shade", 0, { 2.55957, 1,
1.397461, 0 } },
+ { "Canon", "EOS 5D Mark II", "Shade", 1, { 2.585938, 1,
1.383789, 0 } },
+ { "Canon", "EOS 5D Mark II", "Shade", 2, { 2.605469, 1,
1.371094, 0 } },
+ { "Canon", "EOS 5D Mark II", "Shade", 3, { 2.632813, 1,
1.354492, 0 } },
+ { "Canon", "EOS 5D Mark II", "Shade", 4, { 2.660156, 1,
1.338867, 0 } },
+ { "Canon", "EOS 5D Mark II", "Shade", 5, { 2.6875, 1,
1.316406, 0 } },
+ { "Canon", "EOS 5D Mark II", "Shade", 6, { 2.723633, 1,
1.290039, 0 } },
+ { "Canon", "EOS 5D Mark II", "Shade", 7, { 2.767578, 1,
1.260742, 0 } },
+ { "Canon", "EOS 5D Mark II", "Shade", 8, { 2.821289, 1,
1.232422, 0 } },
+ { "Canon", "EOS 5D Mark II", "Shade", 9, { 2.868164, 1,
1.203125, 0 } },
+ { "Canon", "EOS 5D Mark II", "Cloudy", -9, { 2.098633, 1, 1.8125,
0 } },
+ { "Canon", "EOS 5D Mark II", "Cloudy", -8, { 2.124023, 1, 1.78418,
0 } },
+ { "Canon", "EOS 5D Mark II", "Cloudy", -7, { 2.15625, 1, 1.75,
0 } },
+ { "Canon", "EOS 5D Mark II", "Cloudy", -6, { 2.188477, 1,
1.717773, 0 } },
+ { "Canon", "EOS 5D Mark II", "Cloudy", -5, { 2.22168, 1,
1.686523, 0 } },
+ { "Canon", "EOS 5D Mark II", "Cloudy", -4, { 2.255859, 1,
1.657227, 0 } },
+ { "Canon", "EOS 5D Mark II", "Cloudy", -3, { 2.295898, 1,
1.623047, 0 } },
+ { "Canon", "EOS 5D Mark II", "Cloudy", -2, { 2.333008, 1,
1.592773, 0 } },
+ { "Canon", "EOS 5D Mark II", "Cloudy", -1, { 2.359375, 1,
1.558594, 0 } },
+ { "Canon", "EOS 5D Mark II", "Cloudy", 0, { 2.392578, 1,
1.523438, 0 } },
+ { "Canon", "EOS 5D Mark II", "Cloudy", 1, { 2.426758, 1,
1.499023, 0 } },
+ { "Canon", "EOS 5D Mark II", "Cloudy", 2, { 2.456055, 1,
1.473633, 0 } },
+ { "Canon", "EOS 5D Mark II", "Cloudy", 3, { 2.491211, 1,
1.446289, 0 } },
+ { "Canon", "EOS 5D Mark II", "Cloudy", 4, { 2.52832, 1,
1.419922, 0 } },
+ { "Canon", "EOS 5D Mark II", "Cloudy", 5, { 2.566406, 1,
1.395508, 0 } },
+ { "Canon", "EOS 5D Mark II", "Cloudy", 6, { 2.585938, 1,
1.379883, 0 } },
+ { "Canon", "EOS 5D Mark II", "Cloudy", 7, { 2.612305, 1,
1.367188, 0 } },
+ { "Canon", "EOS 5D Mark II", "Cloudy", 8, { 2.639648, 1,
1.350586, 0 } },
+ { "Canon", "EOS 5D Mark II", "Cloudy", 9, { 2.660156, 1,
1.334961, 0 } },
+ { "Canon", "EOS 5D Mark II", "Tungsten", -9, { 1.383128, 1,
3.084359, 0 } },
+ { "Canon", "EOS 5D Mark II", "Tungsten", -8, { 1.399119, 1,
3.026432, 0 } },
+ { "Canon", "EOS 5D Mark II", "Tungsten", -7, { 1.419098, 1,
2.984085, 0 } },
+ { "Canon", "EOS 5D Mark II", "Tungsten", -6, { 1.439219, 1,
2.935226, 0 } },
+ { "Canon", "EOS 5D Mark II", "Tungsten", -5, { 1.460374, 1, 2.88691,
0 } },
+ { "Canon", "EOS 5D Mark II", "Tungsten", -4, { 1.484361, 1,
2.840036, 0 } },
+ { "Canon", "EOS 5D Mark II", "Tungsten", -3, { 1.503139, 1,
2.787444, 0 } },
+ { "Canon", "EOS 5D Mark II", "Tungsten", -2, { 1.527027, 1,
2.740541, 0 } },
+ { "Canon", "EOS 5D Mark II", "Tungsten", -1, { 1.550226, 1,
2.695023, 0 } },
+ { "Canon", "EOS 5D Mark II", "Tungsten", 0, { 1.573115, 1,
2.646685, 0 } },
+ { "Canon", "EOS 5D Mark II", "Tungsten", 1, { 1.594891, 1,
2.596715, 0 } },
+ { "Canon", "EOS 5D Mark II", "Tungsten", 2, { 1.615949, 1,
2.549038, 0 } },
+ { "Canon", "EOS 5D Mark II", "Tungsten", 3, { 1.63871, 1,
2.494009, 0 } },
+ { "Canon", "EOS 5D Mark II", "Tungsten", 4, { 1.661111, 1,
2.443519, 0 } },
+ { "Canon", "EOS 5D Mark II", "Tungsten", 5, { 1.689013, 1,
2.391993, 0 } },
+ { "Canon", "EOS 5D Mark II", "Tungsten", 6, { 1.712816, 1, 2.34986,
0 } },
+ { "Canon", "EOS 5D Mark II", "Tungsten", 7, { 1.736595, 1,
2.305738, 0 } },
+ { "Canon", "EOS 5D Mark II", "Tungsten", 8, { 1.760417, 1,
2.266098, 0 } },
+ { "Canon", "EOS 5D Mark II", "Tungsten", 9, { 1.787417, 1,
2.222116, 0 } },
+ { "Canon", "EOS 5D Mark II", "Fluorescent", -9, { 1.669691, 1,
2.900181, 0 } },
+ { "Canon", "EOS 5D Mark II", "Fluorescent", -8, { 1.695533, 1, 2.84959,
0 } },
+ { "Canon", "EOS 5D Mark II", "Fluorescent", -7, { 1.717033, 1,
2.806777, 0 } },
+ { "Canon", "EOS 5D Mark II", "Fluorescent", -6, { 1.740809, 1,
2.761029, 0 } },
+ { "Canon", "EOS 5D Mark II", "Fluorescent", -5, { 1.765683, 1, 2.71679,
0 } },
+ { "Canon", "EOS 5D Mark II", "Fluorescent", -4, { 1.794063, 1,
2.667904, 0 } },
+ { "Canon", "EOS 5D Mark II", "Fluorescent", -3, { 1.820298, 1,
2.619181, 0 } },
+ { "Canon", "EOS 5D Mark II", "Fluorescent", -2, { 1.84176, 1,
2.567416, 0 } },
+ { "Canon", "EOS 5D Mark II", "Fluorescent", -1, { 1.870056, 1,
2.516949, 0 } },
+ { "Canon", "EOS 5D Mark II", "Fluorescent", 0, { 1.895833, 1,
2.461174, 0 } },
+ { "Canon", "EOS 5D Mark II", "Fluorescent", 1, { 1.928503, 1,
2.416587, 0 } },
+ { "Canon", "EOS 5D Mark II", "Fluorescent", 2, { 1.956772, 1,
2.365994, 0 } },
+ { "Canon", "EOS 5D Mark II", "Fluorescent", 3, { 1.978744, 1,
2.320773, 0 } },
+ { "Canon", "EOS 5D Mark II", "Fluorescent", 4, { 2.009718, 1,
2.281827, 0 } },
+ { "Canon", "EOS 5D Mark II", "Fluorescent", 5, { 2.036133, 1,
2.240234, 0 } },
+ { "Canon", "EOS 5D Mark II", "Fluorescent", 6, { 2.068359, 1,
2.197266, 0 } },
+ { "Canon", "EOS 5D Mark II", "Fluorescent", 7, { 2.098633, 1,
2.160156, 0 } },
+ { "Canon", "EOS 5D Mark II", "Fluorescent", 8, { 2.128906, 1,
2.120117, 0 } },
+ { "Canon", "EOS 5D Mark II", "Fluorescent", 9, { 2.15625, 1,
2.081055, 0 } },
+ { "Canon", "EOS 5D Mark II", "Flash", -9, { 2.111328, 1,
1.792969, 0 } },
+ { "Canon", "EOS 5D Mark II", "Flash", -8, { 2.142578, 1,
1.762695, 0 } },
+ { "Canon", "EOS 5D Mark II", "Flash", -7, { 2.173828, 1,
1.732422, 0 } },
+ { "Canon", "EOS 5D Mark II", "Flash", -6, { 2.207031, 1,
1.698242, 0 } },
+ { "Canon", "EOS 5D Mark II", "Flash", -5, { 2.240234, 1,
1.667969, 0 } },
+ { "Canon", "EOS 5D Mark II", "Flash", -4, { 2.280273, 1,
1.635742, 0 } },
+ { "Canon", "EOS 5D Mark II", "Flash", -3, { 2.316406, 1,
1.602539, 0 } },
+ { "Canon", "EOS 5D Mark II", "Flash", -2, { 2.348633, 1,
1.570313, 0 } },
+ { "Canon", "EOS 5D Mark II", "Flash", -1, { 2.381836, 1,
1.537109, 0 } },
+ { "Canon", "EOS 5D Mark II", "Flash", 0, { 2.40918, 1,
1.507813, 0 } },
+ { "Canon", "EOS 5D Mark II", "Flash", 1, { 2.444336, 1,
1.484375, 0 } },
+ { "Canon", "EOS 5D Mark II", "Flash", 2, { 2.479492, 1,
1.457031, 0 } },
+ { "Canon", "EOS 5D Mark II", "Flash", 3, { 2.515625, 1,
1.429688, 0 } },
+ { "Canon", "EOS 5D Mark II", "Flash", 4, { 2.553711, 1,
1.402344, 0 } },
+ { "Canon", "EOS 5D Mark II", "Flash", 5, { 2.579102, 1,
1.385742, 0 } },
+ { "Canon", "EOS 5D Mark II", "Flash", 6, { 2.598633, 1,
1.373047, 0 } },
+ { "Canon", "EOS 5D Mark II", "Flash", 7, { 2.625977, 1,
1.356445, 0 } },
+ { "Canon", "EOS 5D Mark II", "Flash", 8, { 2.65332, 1,
1.339844, 0 } },
+ { "Canon", "EOS 5D Mark II", "Flash", 9, { 2.680664, 1,
1.321289, 0 } },
/* Fine-tuning for the 7D are the camera's Amber-Blue bracketing. */
{ "Canon", "EOS 7D", Daylight, -3, { 2.036, 1, 1.595, 0 } },
@@ -868,6 +977,14 @@
{ "Canon", "EOS Kiss Digital F", Fluorescent, 0, { 1.889648, 1, 2.133789, 0
} },
{ "Canon", "EOS Kiss Digital F", Flash, 0, { 2.541830, 1, 1.769099, 0 } },
+ // Firmware Version 1.1.6
+ { "Canon", "EOS-1Ds Mark II", "Daylight", 0, { 1.992188, 1,
1.503906, 0 } },
+ { "Canon", "EOS-1Ds Mark II", "Shade", 0, { 2.300781, 1,
1.243164, 0 } },
+ { "Canon", "EOS-1Ds Mark II", "Cloudy", 0, { 2.146484, 1,
1.363281, 0 } },
+ { "Canon", "EOS-1Ds Mark II", "Tungsten", 0, { 1.395018, 1,
2.370107, 0 } },
+ { "Canon", "EOS-1Ds Mark II", "Fluorescent", 0, { 1.854792, 1,
2.067764, 0 } },
+ { "Canon", "EOS-1Ds Mark II", "Flash", 0, { 2.235352, 1,
1.297852, 0 } },
+
{ "Canon", "EOS-1D Mark II", Cloudy, 0, { 2.093750, 1, 1.166016, 0 } },
{ "Canon", "EOS-1D Mark II", Daylight, 0, { 1.957031, 1, 1.295898, 0 } },
{ "Canon", "EOS-1D Mark II", Flash, 0, { 2.225586, 1, 1.172852, 0 } },
@@ -882,6 +999,14 @@
{ "Canon", "EOS-1D Mark II N", Shade, 0, { 2.337891, 1, 1.112305, 0 } },
{ "Canon", "EOS-1D Mark II N", Tungsten, 0, { 1.408514, 1, 2.147645, 0 } },
+ // Firmware Version 1.0.6 (Temporary)
+ { "Canon", "EOS-1D Mark IV", "Daylight", 0, { 2.040039, 1,
1.558594, 0 } },
+ { "Canon", "EOS-1D Mark IV", "Shade", 0, { 2.342773, 1,
1.333008, 0 } },
+ { "Canon", "EOS-1D Mark IV", "Cloudy", 0, { 2.188477, 1,
1.440430, 0 } },
+ { "Canon", "EOS-1D Mark IV", "Tungsten", 0, { 1.458333, 1,
2.305254, 0 } },
+ { "Canon", "EOS-1D Mark IV", "Fluorescent", 0, { 1.767892, 1,
2.205029, 0 } },
+ { "Canon", "EOS-1D Mark IV", "Flash", 0, { 2.230469, 1,
1.423828, 0 } },
+
{ "FUJIFILM", "FinePix E900", Daylight, 0, { 1.571875, 1, 1.128125, 0 } },
{ "FUJIFILM", "FinePix E900", Shade, 0, { 1.668750, 1, 1.006250, 0 } },
{ "FUJIFILM", "FinePix E900", DaylightFluorescent, 0, { 1.907609, 1,
1.016304, 0 } },
------------------------------------------------------------------------------
The Next 800 Companies to Lead America's Growth: New Video Whitepaper
David G. Thomson, author of the best-selling book "Blueprint to a
Billion" shares his insights and actions to help propel your
business during the next growth cycle. Listen Now!
http://p.sf.net/sfu/SAP-dev2dev
_______________________________________________
ufraw-cvs mailing list
ufraw-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs
