Update of /cvsroot/ufraw/ufraw
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv26783
Modified Files:
wb_presets.c
Log Message:
Fix Canon EOS Kiss X[2-6i] naming. Thanks to Pascal de Bruijn for the
information.
Index: wb_presets.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/wb_presets.c,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -d -r1.246 -r1.247
--- wb_presets.c 3 Mar 2013 04:50:20 -0000 1.246
+++ wb_presets.c 13 Apr 2013 02:30:22 -0000 1.247
@@ -1199,12 +1199,12 @@
{ "Canon", "EOS DIGITAL REBEL XSi", Fluorescent, 0, { 1.922857, 1, 1.996190,
0 } },
{ "Canon", "EOS DIGITAL REBEL XSi", Flash, 0, { 2.456055, 1, 1.318359, 0 } },
- { "Canon", "EOS Kiss Digital X2", Daylight, 0, { 2.216797, 1, 1.471680, 0 }
},
- { "Canon", "EOS Kiss Digital X2", Shade, 0, { 2.566406, 1, 1.241211, 0 } },
- { "Canon", "EOS Kiss Digital X2", Cloudy, 0, { 2.386719, 1, 1.345703, 0 } },
- { "Canon", "EOS Kiss Digital X2", Tungsten, 0, { 1.559034, 1, 2.170841, 0 }
},
- { "Canon", "EOS Kiss Digital X2", Fluorescent, 0, { 1.922857, 1, 1.996190, 0
} },
- { "Canon", "EOS Kiss Digital X2", Flash, 0, { 2.456055, 1, 1.318359, 0 } },
+ { "Canon", "EOS Kiss X2", Daylight, 0, { 2.216797, 1, 1.471680, 0 } },
+ { "Canon", "EOS Kiss X2", Shade, 0, { 2.566406, 1, 1.241211, 0 } },
+ { "Canon", "EOS Kiss X2", Cloudy, 0, { 2.386719, 1, 1.345703, 0 } },
+ { "Canon", "EOS Kiss X2", Tungsten, 0, { 1.559034, 1, 2.170841, 0 } },
+ { "Canon", "EOS Kiss X2", Fluorescent, 0, { 1.922857, 1, 1.996190, 0 } },
+ { "Canon", "EOS Kiss X2", Flash, 0, { 2.456055, 1, 1.318359, 0 } },
{ "Canon", "EOS 500D", Daylight, 0, { 2.023438, 1, 1.417969, 0 } },
{ "Canon", "EOS 500D", Shade, 0, { 2.291016, 1, 1.217773, 0 } },
@@ -1220,12 +1220,12 @@
{ "Canon", "EOS REBEL T1i", Fluorescent, 0, { 1.799224, 1, 1.824442, 0 } },
{ "Canon", "EOS REBEL T1i", Flash, 0, { 2.207031, 1,
1.295898, 0 } },
- { "Canon", "EOS Kiss Digital X3", Daylight, 0, { 2.023438, 1, 1.417969, 0 }
},
- { "Canon", "EOS Kiss Digital X3", Shade, 0, { 2.291016, 1, 1.217773, 0 } },
- { "Canon", "EOS Kiss Digital X3", Cloudy, 0, { 2.156250, 1, 1.304687, 0 } },
- { "Canon", "EOS Kiss Digital X3", Tungsten, 0, { 1.481347, 1, 1.976342, 0 }
},
- { "Canon", "EOS Kiss Digital X3", Fluorescent, 0, { 1.799224, 1, 1.824442, 0
} },
- { "Canon", "EOS Kiss Digital X3", Flash, 0, { 2.207031, 1, 1.295898, 0 } },
+ { "Canon", "EOS Kiss X3", Daylight, 0, { 2.023438, 1, 1.417969, 0 } },
+ { "Canon", "EOS Kiss X3", Shade, 0, { 2.291016, 1, 1.217773, 0 } },
+ { "Canon", "EOS Kiss X3", Cloudy, 0, { 2.156250, 1, 1.304687, 0 } },
+ { "Canon", "EOS Kiss X3", Tungsten, 0, { 1.481347, 1, 1.976342, 0 } },
+ { "Canon", "EOS Kiss X3", Fluorescent, 0, { 1.799224, 1, 1.824442, 0 } },
+ { "Canon", "EOS Kiss X3", Flash, 0, { 2.207031, 1, 1.295898, 0 } },
/* Canon EOS 550D Firmware Version 1.0.9 */
/* Fine-tuning is the camera's Amber-Blue bracketing. */
@@ -1459,120 +1459,120 @@
{ "Canon", "EOS REBEL T2i", Flash, 8, { 2.653320, 1,
1.244141, 0 } },
{ "Canon", "EOS REBEL T2i", Flash, 9, { 2.680664, 1,
1.226563, 0 } },
- { "Canon", "EOS Kiss Digital X4", Daylight, -9, { 1.903320, 1, 1.784180, 0 }
},
- { "Canon", "EOS Kiss Digital X4", Daylight, -8, { 1.924805, 1, 1.756836, 0 }
},
- { "Canon", "EOS Kiss Digital X4", Daylight, -7, { 1.950195, 1, 1.729492, 0 }
},
- { "Canon", "EOS Kiss Digital X4", Daylight, -6, { 1.980469, 1, 1.701172, 0 }
},
- { "Canon", "EOS Kiss Digital X4", Daylight, -5, { 2.007813, 1, 1.672852, 0 }
},
- { "Canon", "EOS Kiss Digital X4", Daylight, -4, { 2.040039, 1, 1.646484, 0 }
},
- { "Canon", "EOS Kiss Digital X4", Daylight, -3, { 2.064453, 1, 1.615234, 0 }
},
- { "Canon", "EOS Kiss Digital X4", Daylight, -2, { 2.089844, 1, 1.587891, 0 }
},
- { "Canon", "EOS Kiss Digital X4", Daylight, -1, { 2.120117, 1, 1.556641, 0 }
},
- { "Canon", "EOS Kiss Digital X4", Daylight, 0, { 2.146484, 1, 1.526367, 0 }
},
- { "Canon", "EOS Kiss Digital X4", Daylight, 1, { 2.178711, 1, 1.503906, 0 }
},
- { "Canon", "EOS Kiss Digital X4", Daylight, 2, { 2.211914, 1, 1.481445, 0 }
},
- { "Canon", "EOS Kiss Digital X4", Daylight, 3, { 2.246094, 1, 1.458984, 0 }
},
- { "Canon", "EOS Kiss Digital X4", Daylight, 4, { 2.280273, 1, 1.436523, 0 }
},
- { "Canon", "EOS Kiss Digital X4", Daylight, 5, { 2.316406, 1, 1.412109, 0 }
},
- { "Canon", "EOS Kiss Digital X4", Daylight, 6, { 2.342773, 1, 1.391602, 0 }
},
- { "Canon", "EOS Kiss Digital X4", Daylight, 7, { 2.375977, 1, 1.373047, 0 }
},
- { "Canon", "EOS Kiss Digital X4", Daylight, 8, { 2.409180, 1, 1.350586, 0 }
},
- { "Canon", "EOS Kiss Digital X4", Daylight, 9, { 2.444336, 1, 1.328125, 0 }
},
- { "Canon", "EOS Kiss Digital X4", Shade, -9, { 2.173828, 1, 1.507813, 0 } },
- { "Canon", "EOS Kiss Digital X4", Shade, -8, { 2.207031, 1, 1.484375, 0 } },
- { "Canon", "EOS Kiss Digital X4", Shade, -7, { 2.240234, 1, 1.460938, 0 } },
- { "Canon", "EOS Kiss Digital X4", Shade, -6, { 2.275391, 1, 1.438477, 0 } },
- { "Canon", "EOS Kiss Digital X4", Shade, -5, { 2.311523, 1, 1.414063, 0 } },
- { "Canon", "EOS Kiss Digital X4", Shade, -4, { 2.342773, 1, 1.395508, 0 } },
- { "Canon", "EOS Kiss Digital X4", Shade, -3, { 2.370117, 1, 1.374023, 0 } },
- { "Canon", "EOS Kiss Digital X4", Shade, -2, { 2.403320, 1, 1.352539, 0 } },
- { "Canon", "EOS Kiss Digital X4", Shade, -1, { 2.444336, 1, 1.332031, 0 } },
- { "Canon", "EOS Kiss Digital X4", Shade, 0, { 2.479492, 1, 1.307617, 0 } },
- { "Canon", "EOS Kiss Digital X4", Shade, 1, { 2.509766, 1, 1.292969, 0 } },
- { "Canon", "EOS Kiss Digital X4", Shade, 2, { 2.541016, 1, 1.276367, 0 } },
- { "Canon", "EOS Kiss Digital X4", Shade, 3, { 2.573242, 1, 1.259766, 0 } },
- { "Canon", "EOS Kiss Digital X4", Shade, 4, { 2.612305, 1, 1.241211, 0 } },
- { "Canon", "EOS Kiss Digital X4", Shade, 5, { 2.645508, 1, 1.223633, 0 } },
- { "Canon", "EOS Kiss Digital X4", Shade, 6, { 2.673828, 1, 1.206055, 0 } },
- { "Canon", "EOS Kiss Digital X4", Shade, 7, { 2.702148, 1, 1.187500, 0 } },
- { "Canon", "EOS Kiss Digital X4", Shade, 8, { 2.738281, 1, 1.168945, 0 } },
- { "Canon", "EOS Kiss Digital X4", Shade, 9, { 2.782227, 1, 1.148438, 0 } },
- { "Canon", "EOS Kiss Digital X4", Cloudy, -9, { 2.043945, 1,
1.640625, 0 } },
- { "Canon", "EOS Kiss Digital X4", Cloudy, -8, { 2.068359, 1,
1.612305, 0 } },
- { "Canon", "EOS Kiss Digital X4", Cloudy, -7, { 2.093750, 1,
1.583008, 0 } },
- { "Canon", "EOS Kiss Digital X4", Cloudy, -6, { 2.120117, 1,
1.553711, 0 } },
- { "Canon", "EOS Kiss Digital X4", Cloudy, -5, { 2.151367, 1,
1.523438, 0 } },
- { "Canon", "EOS Kiss Digital X4", Cloudy, -4, { 2.183594, 1,
1.501953, 0 } },
- { "Canon", "EOS Kiss Digital X4", Cloudy, -3, { 2.216797, 1,
1.477539, 0 } },
- { "Canon", "EOS Kiss Digital X4", Cloudy, -2, { 2.250977, 1,
1.454102, 0 } },
- { "Canon", "EOS Kiss Digital X4", Cloudy, -1, { 2.280273, 1,
1.432617, 0 } },
- { "Canon", "EOS Kiss Digital X4", Cloudy, 0, { 2.316406, 1, 1.408203, 0 } },
- { "Canon", "EOS Kiss Digital X4", Cloudy, 1, { 2.348633, 1, 1.389648, 0 } },
- { "Canon", "EOS Kiss Digital X4", Cloudy, 2, { 2.381836, 1, 1.369141, 0 } },
- { "Canon", "EOS Kiss Digital X4", Cloudy, 3, { 2.415039, 1, 1.347656, 0 } },
- { "Canon", "EOS Kiss Digital X4", Cloudy, 4, { 2.450195, 1, 1.326172, 0 } },
- { "Canon", "EOS Kiss Digital X4", Cloudy, 5, { 2.491211, 1, 1.304688, 0 } },
- { "Canon", "EOS Kiss Digital X4", Cloudy, 6, { 2.515625, 1, 1.290039, 0 } },
- { "Canon", "EOS Kiss Digital X4", Cloudy, 7, { 2.546875, 1, 1.272461, 0 } },
- { "Canon", "EOS Kiss Digital X4", Cloudy, 8, { 2.579102, 1, 1.254883, 0 } },
- { "Canon", "EOS Kiss Digital X4", Cloudy, 9, { 2.619141, 1, 1.236328, 0 } },
- { "Canon", "EOS Kiss Digital X4", Tungsten, -9, { 1.345703, 1, 2.605469, 0 }
},
- { "Canon", "EOS Kiss Digital X4", Tungsten, -8, { 1.361328, 1, 2.579102, 0 }
},
- { "Canon", "EOS Kiss Digital X4", Tungsten, -7, { 1.379883, 1, 2.546875, 0 }
},
- { "Canon", "EOS Kiss Digital X4", Tungsten, -6, { 1.398438, 1, 2.515625, 0 }
},
- { "Canon", "EOS Kiss Digital X4", Tungsten, -5, { 1.417969, 1, 2.491211, 0 }
},
- { "Canon", "EOS Kiss Digital X4", Tungsten, -4, { 1.440430, 1, 2.456055, 0 }
},
- { "Canon", "EOS Kiss Digital X4", Tungsten, -3, { 1.460938, 1, 2.409180, 0 }
},
- { "Canon", "EOS Kiss Digital X4", Tungsten, -2, { 1.479492, 1, 2.365234, 0 }
},
- { "Canon", "EOS Kiss Digital X4", Tungsten, -1, { 1.503906, 1, 2.322266, 0 }
},
- { "Canon", "EOS Kiss Digital X4", Tungsten, 0, { 1.526367, 1, 2.275391, 0 }
},
- { "Canon", "EOS Kiss Digital X4", Tungsten, 1, { 1.546875, 1, 2.240234, 0 }
},
- { "Canon", "EOS Kiss Digital X4", Tungsten, 2, { 1.568359, 1, 2.207031, 0 }
},
- { "Canon", "EOS Kiss Digital X4", Tungsten, 3, { 1.589844, 1, 2.169922, 0 }
},
- { "Canon", "EOS Kiss Digital X4", Tungsten, 4, { 1.612305, 1, 2.137695, 0 }
},
- { "Canon", "EOS Kiss Digital X4", Tungsten, 5, { 1.638672, 1, 2.102539, 0 }
},
- { "Canon", "EOS Kiss Digital X4", Tungsten, 6, { 1.662109, 1, 2.068359, 0 }
},
- { "Canon", "EOS Kiss Digital X4", Tungsten, 7, { 1.684570, 1, 2.032227, 0 }
},
- { "Canon", "EOS Kiss Digital X4", Tungsten, 8, { 1.707031, 1, 2.000000, 0 }
},
- { "Canon", "EOS Kiss Digital X4", Tungsten, 9, { 1.732422, 1, 1.965820, 0 }
},
- { "Canon", "EOS Kiss Digital X4", WhiteFluorescent, -9, { 1.662109, 1,
2.473633, 0 } },
- { "Canon", "EOS Kiss Digital X4", WhiteFluorescent, -8, { 1.684570, 1,
2.432617, 0 } },
- { "Canon", "EOS Kiss Digital X4", WhiteFluorescent, -7, { 1.709961, 1,
2.392578, 0 } },
- { "Canon", "EOS Kiss Digital X4", WhiteFluorescent, -6, { 1.735352, 1,
2.342773, 0 } },
- { "Canon", "EOS Kiss Digital X4", WhiteFluorescent, -5, { 1.762695, 1,
2.300781, 0 } },
- { "Canon", "EOS Kiss Digital X4", WhiteFluorescent, -4, { 1.787109, 1,
2.260742, 0 } },
- { "Canon", "EOS Kiss Digital X4", WhiteFluorescent, -3, { 1.812500, 1,
2.226563, 0 } },
- { "Canon", "EOS Kiss Digital X4", WhiteFluorescent, -2, { 1.841797, 1,
2.188477, 0 } },
- { "Canon", "EOS Kiss Digital X4", WhiteFluorescent, -1, { 1.872070, 1,
2.156250, 0 } },
- { "Canon", "EOS Kiss Digital X4", WhiteFluorescent, 0, { 1.899414, 1,
2.115234, 0 } },
- { "Canon", "EOS Kiss Digital X4", WhiteFluorescent, 1, { 1.924805, 1,
2.081055, 0 } },
- { "Canon", "EOS Kiss Digital X4", WhiteFluorescent, 2, { 1.950195, 1,
2.051758, 0 } },
- { "Canon", "EOS Kiss Digital X4", WhiteFluorescent, 3, { 1.976563, 1,
2.015625, 0 } },
- { "Canon", "EOS Kiss Digital X4", WhiteFluorescent, 4, { 2.007813, 1,
1.984375, 0 } },
- { "Canon", "EOS Kiss Digital X4", WhiteFluorescent, 5, { 2.040039, 1,
1.950195, 0 } },
- { "Canon", "EOS Kiss Digital X4", WhiteFluorescent, 6, { 2.064453, 1,
1.920898, 0 } },
- { "Canon", "EOS Kiss Digital X4", WhiteFluorescent, 7, { 2.089844, 1,
1.889648, 0 } },
- { "Canon", "EOS Kiss Digital X4", WhiteFluorescent, 8, { 2.120117, 1,
1.862305, 0 } },
- { "Canon", "EOS Kiss Digital X4", WhiteFluorescent, 9, { 2.146484, 1,
1.832031, 0 } },
- { "Canon", "EOS Kiss Digital X4", Flash, -9, { 2.098633, 1, 1.625000, 0 } },
- { "Canon", "EOS Kiss Digital X4", Flash, -8, { 2.124023, 1, 1.594727, 0 } },
- { "Canon", "EOS Kiss Digital X4", Flash, -7, { 2.156250, 1, 1.565430, 0 } },
- { "Canon", "EOS Kiss Digital X4", Flash, -6, { 2.188477, 1, 1.535156, 0 } },
- { "Canon", "EOS Kiss Digital X4", Flash, -5, { 2.221680, 1, 1.510742, 0 } },
- { "Canon", "EOS Kiss Digital X4", Flash, -4, { 2.255859, 1, 1.488281, 0 } },
- { "Canon", "EOS Kiss Digital X4", Flash, -3, { 2.286133, 1, 1.464844, 0 } },
- { "Canon", "EOS Kiss Digital X4", Flash, -2, { 2.322266, 1, 1.442383, 0 } },
- { "Canon", "EOS Kiss Digital X4", Flash, -1, { 2.354492, 1, 1.419922, 0 } },
- { "Canon", "EOS Kiss Digital X4", Flash, 0, { 2.381836, 1, 1.397461, 0 } },
- { "Canon", "EOS Kiss Digital X4", Flash, 1, { 2.420898, 1, 1.377930, 0 } },
- { "Canon", "EOS Kiss Digital X4", Flash, 2, { 2.456055, 1, 1.356445, 0 } },
- { "Canon", "EOS Kiss Digital X4", Flash, 3, { 2.491211, 1, 1.334961, 0 } },
- { "Canon", "EOS Kiss Digital X4", Flash, 4, { 2.522461, 1, 1.312500, 0 } },
- { "Canon", "EOS Kiss Digital X4", Flash, 5, { 2.553711, 1, 1.295898, 0 } },
- { "Canon", "EOS Kiss Digital X4", Flash, 6, { 2.585938, 1, 1.280273, 0 } },
- { "Canon", "EOS Kiss Digital X4", Flash, 7, { 2.625977, 1, 1.262695, 0 } },
- { "Canon", "EOS Kiss Digital X4", Flash, 8, { 2.653320, 1, 1.244141, 0 } },
- { "Canon", "EOS Kiss Digital X4", Flash, 9, { 2.680664, 1, 1.226563, 0 } },
+ { "Canon", "EOS Kiss X4", Daylight, -9, { 1.903320, 1, 1.784180, 0 } },
+ { "Canon", "EOS Kiss X4", Daylight, -8, { 1.924805, 1, 1.756836, 0 } },
+ { "Canon", "EOS Kiss X4", Daylight, -7, { 1.950195, 1, 1.729492, 0 } },
+ { "Canon", "EOS Kiss X4", Daylight, -6, { 1.980469, 1, 1.701172, 0 } },
+ { "Canon", "EOS Kiss X4", Daylight, -5, { 2.007813, 1, 1.672852, 0 } },
+ { "Canon", "EOS Kiss X4", Daylight, -4, { 2.040039, 1, 1.646484, 0 } },
+ { "Canon", "EOS Kiss X4", Daylight, -3, { 2.064453, 1, 1.615234, 0 } },
+ { "Canon", "EOS Kiss X4", Daylight, -2, { 2.089844, 1, 1.587891, 0 } },
+ { "Canon", "EOS Kiss X4", Daylight, -1, { 2.120117, 1, 1.556641, 0 } },
+ { "Canon", "EOS Kiss X4", Daylight, 0, { 2.146484, 1, 1.526367, 0 } },
+ { "Canon", "EOS Kiss X4", Daylight, 1, { 2.178711, 1, 1.503906, 0 } },
+ { "Canon", "EOS Kiss X4", Daylight, 2, { 2.211914, 1, 1.481445, 0 } },
+ { "Canon", "EOS Kiss X4", Daylight, 3, { 2.246094, 1, 1.458984, 0 } },
+ { "Canon", "EOS Kiss X4", Daylight, 4, { 2.280273, 1, 1.436523, 0 } },
+ { "Canon", "EOS Kiss X4", Daylight, 5, { 2.316406, 1, 1.412109, 0 } },
+ { "Canon", "EOS Kiss X4", Daylight, 6, { 2.342773, 1, 1.391602, 0 } },
+ { "Canon", "EOS Kiss X4", Daylight, 7, { 2.375977, 1, 1.373047, 0 } },
+ { "Canon", "EOS Kiss X4", Daylight, 8, { 2.409180, 1, 1.350586, 0 } },
+ { "Canon", "EOS Kiss X4", Daylight, 9, { 2.444336, 1, 1.328125, 0 } },
+ { "Canon", "EOS Kiss X4", Shade, -9, { 2.173828, 1, 1.507813, 0 } },
+ { "Canon", "EOS Kiss X4", Shade, -8, { 2.207031, 1, 1.484375, 0 } },
+ { "Canon", "EOS Kiss X4", Shade, -7, { 2.240234, 1, 1.460938, 0 } },
+ { "Canon", "EOS Kiss X4", Shade, -6, { 2.275391, 1, 1.438477, 0 } },
+ { "Canon", "EOS Kiss X4", Shade, -5, { 2.311523, 1, 1.414063, 0 } },
+ { "Canon", "EOS Kiss X4", Shade, -4, { 2.342773, 1, 1.395508, 0 } },
+ { "Canon", "EOS Kiss X4", Shade, -3, { 2.370117, 1, 1.374023, 0 } },
+ { "Canon", "EOS Kiss X4", Shade, -2, { 2.403320, 1, 1.352539, 0 } },
+ { "Canon", "EOS Kiss X4", Shade, -1, { 2.444336, 1, 1.332031, 0 } },
+ { "Canon", "EOS Kiss X4", Shade, 0, { 2.479492, 1, 1.307617, 0 } },
+ { "Canon", "EOS Kiss X4", Shade, 1, { 2.509766, 1, 1.292969, 0 } },
+ { "Canon", "EOS Kiss X4", Shade, 2, { 2.541016, 1, 1.276367, 0 } },
+ { "Canon", "EOS Kiss X4", Shade, 3, { 2.573242, 1, 1.259766, 0 } },
+ { "Canon", "EOS Kiss X4", Shade, 4, { 2.612305, 1, 1.241211, 0 } },
+ { "Canon", "EOS Kiss X4", Shade, 5, { 2.645508, 1, 1.223633, 0 } },
+ { "Canon", "EOS Kiss X4", Shade, 6, { 2.673828, 1, 1.206055, 0 } },
+ { "Canon", "EOS Kiss X4", Shade, 7, { 2.702148, 1, 1.187500, 0 } },
+ { "Canon", "EOS Kiss X4", Shade, 8, { 2.738281, 1, 1.168945, 0 } },
+ { "Canon", "EOS Kiss X4", Shade, 9, { 2.782227, 1, 1.148438, 0 } },
+ { "Canon", "EOS Kiss X4", Cloudy, -9, { 2.043945, 1,
1.640625, 0 } },
+ { "Canon", "EOS Kiss X4", Cloudy, -8, { 2.068359, 1,
1.612305, 0 } },
+ { "Canon", "EOS Kiss X4", Cloudy, -7, { 2.093750, 1,
1.583008, 0 } },
+ { "Canon", "EOS Kiss X4", Cloudy, -6, { 2.120117, 1,
1.553711, 0 } },
+ { "Canon", "EOS Kiss X4", Cloudy, -5, { 2.151367, 1,
1.523438, 0 } },
+ { "Canon", "EOS Kiss X4", Cloudy, -4, { 2.183594, 1,
1.501953, 0 } },
+ { "Canon", "EOS Kiss X4", Cloudy, -3, { 2.216797, 1,
1.477539, 0 } },
+ { "Canon", "EOS Kiss X4", Cloudy, -2, { 2.250977, 1,
1.454102, 0 } },
+ { "Canon", "EOS Kiss X4", Cloudy, -1, { 2.280273, 1,
1.432617, 0 } },
+ { "Canon", "EOS Kiss X4", Cloudy, 0, { 2.316406, 1, 1.408203, 0 } },
+ { "Canon", "EOS Kiss X4", Cloudy, 1, { 2.348633, 1, 1.389648, 0 } },
+ { "Canon", "EOS Kiss X4", Cloudy, 2, { 2.381836, 1, 1.369141, 0 } },
+ { "Canon", "EOS Kiss X4", Cloudy, 3, { 2.415039, 1, 1.347656, 0 } },
+ { "Canon", "EOS Kiss X4", Cloudy, 4, { 2.450195, 1, 1.326172, 0 } },
+ { "Canon", "EOS Kiss X4", Cloudy, 5, { 2.491211, 1, 1.304688, 0 } },
+ { "Canon", "EOS Kiss X4", Cloudy, 6, { 2.515625, 1, 1.290039, 0 } },
+ { "Canon", "EOS Kiss X4", Cloudy, 7, { 2.546875, 1, 1.272461, 0 } },
+ { "Canon", "EOS Kiss X4", Cloudy, 8, { 2.579102, 1, 1.254883, 0 } },
+ { "Canon", "EOS Kiss X4", Cloudy, 9, { 2.619141, 1, 1.236328, 0 } },
+ { "Canon", "EOS Kiss X4", Tungsten, -9, { 1.345703, 1, 2.605469, 0 } },
+ { "Canon", "EOS Kiss X4", Tungsten, -8, { 1.361328, 1, 2.579102, 0 } },
+ { "Canon", "EOS Kiss X4", Tungsten, -7, { 1.379883, 1, 2.546875, 0 } },
+ { "Canon", "EOS Kiss X4", Tungsten, -6, { 1.398438, 1, 2.515625, 0 } },
+ { "Canon", "EOS Kiss X4", Tungsten, -5, { 1.417969, 1, 2.491211, 0 } },
+ { "Canon", "EOS Kiss X4", Tungsten, -4, { 1.440430, 1, 2.456055, 0 } },
+ { "Canon", "EOS Kiss X4", Tungsten, -3, { 1.460938, 1, 2.409180, 0 } },
+ { "Canon", "EOS Kiss X4", Tungsten, -2, { 1.479492, 1, 2.365234, 0 } },
+ { "Canon", "EOS Kiss X4", Tungsten, -1, { 1.503906, 1, 2.322266, 0 } },
+ { "Canon", "EOS Kiss X4", Tungsten, 0, { 1.526367, 1, 2.275391, 0 } },
+ { "Canon", "EOS Kiss X4", Tungsten, 1, { 1.546875, 1, 2.240234, 0 } },
+ { "Canon", "EOS Kiss X4", Tungsten, 2, { 1.568359, 1, 2.207031, 0 } },
+ { "Canon", "EOS Kiss X4", Tungsten, 3, { 1.589844, 1, 2.169922, 0 } },
+ { "Canon", "EOS Kiss X4", Tungsten, 4, { 1.612305, 1, 2.137695, 0 } },
+ { "Canon", "EOS Kiss X4", Tungsten, 5, { 1.638672, 1, 2.102539, 0 } },
+ { "Canon", "EOS Kiss X4", Tungsten, 6, { 1.662109, 1, 2.068359, 0 } },
+ { "Canon", "EOS Kiss X4", Tungsten, 7, { 1.684570, 1, 2.032227, 0 } },
+ { "Canon", "EOS Kiss X4", Tungsten, 8, { 1.707031, 1, 2.000000, 0 } },
+ { "Canon", "EOS Kiss X4", Tungsten, 9, { 1.732422, 1, 1.965820, 0 } },
+ { "Canon", "EOS Kiss X4", WhiteFluorescent, -9, { 1.662109, 1, 2.473633, 0 }
},
+ { "Canon", "EOS Kiss X4", WhiteFluorescent, -8, { 1.684570, 1, 2.432617, 0 }
},
+ { "Canon", "EOS Kiss X4", WhiteFluorescent, -7, { 1.709961, 1, 2.392578, 0 }
},
+ { "Canon", "EOS Kiss X4", WhiteFluorescent, -6, { 1.735352, 1, 2.342773, 0 }
},
+ { "Canon", "EOS Kiss X4", WhiteFluorescent, -5, { 1.762695, 1, 2.300781, 0 }
},
+ { "Canon", "EOS Kiss X4", WhiteFluorescent, -4, { 1.787109, 1, 2.260742, 0 }
},
+ { "Canon", "EOS Kiss X4", WhiteFluorescent, -3, { 1.812500, 1, 2.226563, 0 }
},
+ { "Canon", "EOS Kiss X4", WhiteFluorescent, -2, { 1.841797, 1, 2.188477, 0 }
},
+ { "Canon", "EOS Kiss X4", WhiteFluorescent, -1, { 1.872070, 1, 2.156250, 0 }
},
+ { "Canon", "EOS Kiss X4", WhiteFluorescent, 0, { 1.899414, 1, 2.115234, 0 }
},
+ { "Canon", "EOS Kiss X4", WhiteFluorescent, 1, { 1.924805, 1, 2.081055, 0 }
},
+ { "Canon", "EOS Kiss X4", WhiteFluorescent, 2, { 1.950195, 1, 2.051758, 0 }
},
+ { "Canon", "EOS Kiss X4", WhiteFluorescent, 3, { 1.976563, 1, 2.015625, 0 }
},
+ { "Canon", "EOS Kiss X4", WhiteFluorescent, 4, { 2.007813, 1, 1.984375, 0 }
},
+ { "Canon", "EOS Kiss X4", WhiteFluorescent, 5, { 2.040039, 1, 1.950195, 0 }
},
+ { "Canon", "EOS Kiss X4", WhiteFluorescent, 6, { 2.064453, 1, 1.920898, 0 }
},
+ { "Canon", "EOS Kiss X4", WhiteFluorescent, 7, { 2.089844, 1, 1.889648, 0 }
},
+ { "Canon", "EOS Kiss X4", WhiteFluorescent, 8, { 2.120117, 1, 1.862305, 0 }
},
+ { "Canon", "EOS Kiss X4", WhiteFluorescent, 9, { 2.146484, 1, 1.832031, 0 }
},
+ { "Canon", "EOS Kiss X4", Flash, -9, { 2.098633, 1, 1.625000, 0 } },
+ { "Canon", "EOS Kiss X4", Flash, -8, { 2.124023, 1, 1.594727, 0 } },
+ { "Canon", "EOS Kiss X4", Flash, -7, { 2.156250, 1, 1.565430, 0 } },
+ { "Canon", "EOS Kiss X4", Flash, -6, { 2.188477, 1, 1.535156, 0 } },
+ { "Canon", "EOS Kiss X4", Flash, -5, { 2.221680, 1, 1.510742, 0 } },
+ { "Canon", "EOS Kiss X4", Flash, -4, { 2.255859, 1, 1.488281, 0 } },
+ { "Canon", "EOS Kiss X4", Flash, -3, { 2.286133, 1, 1.464844, 0 } },
+ { "Canon", "EOS Kiss X4", Flash, -2, { 2.322266, 1, 1.442383, 0 } },
+ { "Canon", "EOS Kiss X4", Flash, -1, { 2.354492, 1, 1.419922, 0 } },
+ { "Canon", "EOS Kiss X4", Flash, 0, { 2.381836, 1, 1.397461, 0 } },
+ { "Canon", "EOS Kiss X4", Flash, 1, { 2.420898, 1, 1.377930, 0 } },
+ { "Canon", "EOS Kiss X4", Flash, 2, { 2.456055, 1, 1.356445, 0 } },
+ { "Canon", "EOS Kiss X4", Flash, 3, { 2.491211, 1, 1.334961, 0 } },
+ { "Canon", "EOS Kiss X4", Flash, 4, { 2.522461, 1, 1.312500, 0 } },
+ { "Canon", "EOS Kiss X4", Flash, 5, { 2.553711, 1, 1.295898, 0 } },
+ { "Canon", "EOS Kiss X4", Flash, 6, { 2.585938, 1, 1.280273, 0 } },
+ { "Canon", "EOS Kiss X4", Flash, 7, { 2.625977, 1, 1.262695, 0 } },
+ { "Canon", "EOS Kiss X4", Flash, 8, { 2.653320, 1, 1.244141, 0 } },
+ { "Canon", "EOS Kiss X4", Flash, 9, { 2.680664, 1, 1.226563, 0 } },
// Canon EOS 600D firmware version 1.0.2
{ "Canon", "EOS 600D", Daylight, 0, { 2.235352, 1, 1.612305, 0 } },
@@ -1589,12 +1589,12 @@
{ "Canon", "EOS REBEL T3i", Fluorescent, 0, { 1.958008, 1, 2.260742, 0 } },
{ "Canon", "EOS REBEL T3i", Flash, 0, { 2.509766, 1,
1.464844, 0 } },
- { "Canon", "EOS Kiss Digital X5", Daylight, 0, { 2.235352, 1, 1.612305, 0 }
},
- { "Canon", "EOS Kiss Digital X5", Shade, 0, { 2.592773, 1, 1.377930, 0 } },
- { "Canon", "EOS Kiss Digital X5", Cloudy, 0, { 2.409180, 1, 1.486328, 0 } },
- { "Canon", "EOS Kiss Digital X5", Tungsten, 0, { 1.597656, 1, 2.409180, 0 }
},
- { "Canon", "EOS Kiss Digital X5", Fluorescent, 0, { 1.958008, 1, 2.260742, 0
} },
- { "Canon", "EOS Kiss Digital X5", Flash, 0, { 2.509766, 1, 1.464844, 0 } },
+ { "Canon", "EOS Kiss X5", Daylight, 0, { 2.235352, 1, 1.612305, 0 } },
+ { "Canon", "EOS Kiss X5", Shade, 0, { 2.592773, 1, 1.377930, 0 } },
+ { "Canon", "EOS Kiss X5", Cloudy, 0, { 2.409180, 1, 1.486328, 0 } },
+ { "Canon", "EOS Kiss X5", Tungsten, 0, { 1.597656, 1, 2.409180, 0 } },
+ { "Canon", "EOS Kiss X5", Fluorescent, 0, { 1.958008, 1, 2.260742, 0 } },
+ { "Canon", "EOS Kiss X5", Flash, 0, { 2.509766, 1, 1.464844, 0 } },
/* Fine-tuning is the camera's Amber-Blue bracketing. */
{ "Canon", "EOS 650D", Daylight, -3, { 1.9502, 1, 1.7539, 0 } },
@@ -1635,24 +1635,24 @@
{ "Canon", "EOS REBEL T4i", Flash, 0, { 2.2607, 1, 1.5166, 0
} },
{ "Canon", "EOS REBEL T4i", Flash, 3, { 2.3701, 1, 1.4502, 0
} },
- { "Canon", "EOS Kiss Digital X6i", Daylight, -3, { 1.9502, 1, 1.7539, 0 } },
- { "Canon", "EOS Kiss Digital X6i", Daylight, 0, { 2.0322, 1, 1.6572, 0 } },
- { "Canon", "EOS Kiss Digital X6i", Daylight, 3, { 2.1152, 1, 1.5850, 0 } },
- { "Canon", "EOS Kiss Digital X6i", Shade, -3, { 2.2305, 1, 1.4951, 0
} },
- { "Canon", "EOS Kiss Digital X6i", Shade, 0, { 2.3379, 1, 1.4238, 0 } },
- { "Canon", "EOS Kiss Digital X6i", Shade, 3, { 2.4443, 1, 1.3604, 0 } },
- { "Canon", "EOS Kiss Digital X6i", Cloudy, -3, { 2.0898, 1, 1.6074, 0 } },
- { "Canon", "EOS Kiss Digital X6i", Cloudy, 0, { 2.1787, 1, 1.5332, 0
} },
- { "Canon", "EOS Kiss Digital X6i", Cloudy, 3, { 2.2705, 1, 1.4668, 0
} },
- { "Canon", "EOS Kiss Digital X6i", Tungsten, -3, { 1.3975, 1, 2.5928, 0 } },
- { "Canon", "EOS Kiss Digital X6i", Tungsten, 0, { 1.4541, 1, 2.4561, 0 } },
- { "Canon", "EOS Kiss Digital X6i", Tungsten, 3, { 1.5127, 1, 2.3428, 0 } },
- { "Canon", "EOS Kiss Digital X6i", Fluorescent, -3, { 1.6982, 1, 2.4268, 0 }
},
- { "Canon", "EOS Kiss Digital X6i", Fluorescent, 0, { 1.7715, 1, 2.3066, 0 }
},
- { "Canon", "EOS Kiss Digital X6i", Fluorescent, 3, { 1.8486, 1, 2.1973, 0 }
},
- { "Canon", "EOS Kiss Digital X6i", Flash, -3, { 2.1699, 1, 1.5879, 0
} },
- { "Canon", "EOS Kiss Digital X6i", Flash, 0, { 2.2607, 1, 1.5166, 0 } },
- { "Canon", "EOS Kiss Digital X6i", Flash, 3, { 2.3701, 1, 1.4502, 0 } },
+ { "Canon", "EOS Kiss X6i", Daylight, -3, { 1.9502, 1, 1.7539, 0 } },
+ { "Canon", "EOS Kiss X6i", Daylight, 0, { 2.0322, 1, 1.6572, 0 } },
+ { "Canon", "EOS Kiss X6i", Daylight, 3, { 2.1152, 1, 1.5850, 0 } },
+ { "Canon", "EOS Kiss X6i", Shade, -3, { 2.2305, 1, 1.4951, 0
} },
+ { "Canon", "EOS Kiss X6i", Shade, 0, { 2.3379, 1, 1.4238, 0 } },
+ { "Canon", "EOS Kiss X6i", Shade, 3, { 2.4443, 1, 1.3604, 0 } },
+ { "Canon", "EOS Kiss X6i", Cloudy, -3, { 2.0898, 1, 1.6074, 0 } },
+ { "Canon", "EOS Kiss X6i", Cloudy, 0, { 2.1787, 1, 1.5332, 0
} },
+ { "Canon", "EOS Kiss X6i", Cloudy, 3, { 2.2705, 1, 1.4668, 0
} },
+ { "Canon", "EOS Kiss X6i", Tungsten, -3, { 1.3975, 1, 2.5928, 0 } },
+ { "Canon", "EOS Kiss X6i", Tungsten, 0, { 1.4541, 1, 2.4561, 0 } },
+ { "Canon", "EOS Kiss X6i", Tungsten, 3, { 1.5127, 1, 2.3428, 0 } },
+ { "Canon", "EOS Kiss X6i", Fluorescent, -3, { 1.6982, 1, 2.4268, 0 } },
+ { "Canon", "EOS Kiss X6i", Fluorescent, 0, { 1.7715, 1, 2.3066, 0 } },
+ { "Canon", "EOS Kiss X6i", Fluorescent, 3, { 1.8486, 1, 2.1973, 0 } },
+ { "Canon", "EOS Kiss X6i", Flash, -3, { 2.1699, 1, 1.5879, 0
} },
+ { "Canon", "EOS Kiss X6i", Flash, 0, { 2.2607, 1, 1.5166, 0 } },
+ { "Canon", "EOS Kiss X6i", Flash, 3, { 2.3701, 1, 1.4502, 0 } },
{ "Canon", "EOS 1000D", Daylight, 0, { 2.183594, 1, 1.526367, 0 } },
{ "Canon", "EOS 1000D", Shade, 0, { 2.553711, 1, 1.262695, 0 } },
------------------------------------------------------------------------------
Precog is a next-generation analytics platform capable of advanced
analytics on semi-structured data. The platform includes APIs for building
apps and a phenomenal toolset for data science. Developers can use
our toolset for easy data analysis & visualization. Get a free account!
http://www2.precog.com/precogplatform/slashdotnewsletter
_______________________________________________
ufraw-cvs mailing list
ufraw-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs
