Menu
▾
▴
[UFRaw-CVS] ufraw wb_presets.c,1.323,1.324
|
From: Niels K. B. J. <nk...@us...> - 2015-06-23 03:00:14
|
Update of /cvsroot/ufraw/ufraw In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv21281 Modified Files: wb_presets.c Log Message: Update WB presets and add fine-tuning for the Canon EOS 60D. Stolen from Darktable. Index: wb_presets.c =================================================================== RCS file: /cvsroot/ufraw/ufraw/wb_presets.c,v retrieving revision 1.323 retrieving revision 1.324 diff -u -d -r1.323 -r1.324 --- wb_presets.c 21 Jun 2015 03:15:15 -0000 1.323 +++ wb_presets.c 23 Jun 2015 03:00:11 -0000 1.324 @@ -778,12 +778,121 @@ { "Canon", "EOS 50D", "5000K", 0, { 2.056641, 1, 1.438477, 0 } }, { "Canon", "EOS 50D", "6500K", 0, { 2.311523, 1, 1.239258, 0 } }, - { "Canon", "EOS 60D", Daylight, 0, { 2.1514, 1, 1.5420, 0 } }, - { "Canon", "EOS 60D", Shade, 0, { 2.5039, 1, 1.3057, 0 } }, - { "Canon", "EOS 60D", Cloudy, 0, { 2.3223, 1, 1.4160, 0 } }, - { "Canon", "EOS 60D", Tungsten, 0, { 1.5215, 1, 2.3486, 0 } }, - { "Canon", "EOS 60D", Fluorescent, 0, { 1.9248, 1, 2.1836, 0 } }, - { "Canon", "EOS 60D", Flash, 0, { 2.1514, 1, 1.5420, 0 } }, + /* Canon EOS 60D Firmware Version 1.1.1 */ + { "Canon", "EOS 60D", Daylight, -9, { 1.765625, 1, 1.792969, 0 } }, + { "Canon", "EOS 60D", Daylight, -8, { 1.787109, 1, 1.765625, 0 } }, + { "Canon", "EOS 60D", Daylight, -7, { 1.812500, 1, 1.735352, 0 } }, + { "Canon", "EOS 60D", Daylight, -6, { 1.838867, 1, 1.707031, 0 } }, + { "Canon", "EOS 60D", Daylight, -5, { 1.865234, 1, 1.678711, 0 } }, + { "Canon", "EOS 60D", Daylight, -4, { 1.896484, 1, 1.649414, 0 } }, + { "Canon", "EOS 60D", Daylight, -3, { 1.917969, 1, 1.618164, 0 } }, + { "Canon", "EOS 60D", Daylight, -2, { 1.943359, 1, 1.587891, 0 } }, + { "Canon", "EOS 60D", Daylight, -1, { 1.965820, 1, 1.558594, 0 } }, + { "Canon", "EOS 60D", Daylight, 0, { 1.992188, 1, 1.526367, 0 } }, + { "Canon", "EOS 60D", Daylight, 1, { 2.019531, 1, 1.503906, 0 } }, + { "Canon", "EOS 60D", Daylight, 2, { 2.051758, 1, 1.477539, 0 } }, + { "Canon", "EOS 60D", Daylight, 3, { 2.081055, 1, 1.454102, 0 } }, + { "Canon", "EOS 60D", Daylight, 4, { 2.111328, 1, 1.429688, 0 } }, + { "Canon", "EOS 60D", Daylight, 5, { 2.146484, 1, 1.406250, 0 } }, + { "Canon", "EOS 60D", Daylight, 6, { 2.173828, 1, 1.385742, 0 } }, + { "Canon", "EOS 60D", Daylight, 7, { 2.207031, 1, 1.363281, 0 } }, + { "Canon", "EOS 60D", Daylight, 8, { 2.240234, 1, 1.341797, 0 } }, + { "Canon", "EOS 60D", Daylight, 9, { 2.275391, 1, 1.318359, 0 } }, + { "Canon", "EOS 60D", Shade, -9, { 2.019531, 1, 1.505859, 0 } }, + { "Canon", "EOS 60D", Shade, -8, { 2.047852, 1, 1.481445, 0 } }, + { "Canon", "EOS 60D", Shade, -7, { 2.077148, 1, 1.457031, 0 } }, + { "Canon", "EOS 60D", Shade, -6, { 2.107422, 1, 1.434570, 0 } }, + { "Canon", "EOS 60D", Shade, -5, { 2.142578, 1, 1.410156, 0 } }, + { "Canon", "EOS 60D", Shade, -4, { 2.169922, 1, 1.387695, 0 } }, + { "Canon", "EOS 60D", Shade, -3, { 2.202148, 1, 1.365234, 0 } }, + { "Canon", "EOS 60D", Shade, -2, { 2.235352, 1, 1.343750, 0 } }, + { "Canon", "EOS 60D", Shade, -1, { 2.270508, 1, 1.321289, 0 } }, + { "Canon", "EOS 60D", Shade, 0, { 2.311523, 1, 1.295898, 0 } }, + { "Canon", "EOS 60D", Shade, 1, { 2.337891, 1, 1.281250, 0 } }, + { "Canon", "EOS 60D", Shade, 2, { 2.365234, 1, 1.264648, 0 } }, + { "Canon", "EOS 60D", Shade, 3, { 2.398438, 1, 1.247070, 0 } }, + { "Canon", "EOS 60D", Shade, 4, { 2.432617, 1, 1.229492, 0 } }, + { "Canon", "EOS 60D", Shade, 5, { 2.461914, 1, 1.209961, 0 } }, + { "Canon", "EOS 60D", Shade, 6, { 2.485352, 1, 1.193359, 0 } }, + { "Canon", "EOS 60D", Shade, 7, { 2.515625, 1, 1.173828, 0 } }, + { "Canon", "EOS 60D", Shade, 8, { 2.546875, 1, 1.154297, 0 } }, + { "Canon", "EOS 60D", Shade, 9, { 2.585938, 1, 1.132813, 0 } }, + { "Canon", "EOS 60D", Cloudy, -9, { 1.899414, 1, 1.643555, 0 } }, + { "Canon", "EOS 60D", Cloudy, -8, { 1.920898, 1, 1.615234, 0 } }, + { "Canon", "EOS 60D", Cloudy, -7, { 1.943359, 1, 1.584961, 0 } }, + { "Canon", "EOS 60D", Cloudy, -6, { 1.968750, 1, 1.553711, 0 } }, + { "Canon", "EOS 60D", Cloudy, -5, { 1.996094, 1, 1.523438, 0 } }, + { "Canon", "EOS 60D", Cloudy, -4, { 2.023438, 1, 1.499023, 0 } }, + { "Canon", "EOS 60D", Cloudy, -3, { 2.056641, 1, 1.475586, 0 } }, + { "Canon", "EOS 60D", Cloudy, -2, { 2.085938, 1, 1.450195, 0 } }, + { "Canon", "EOS 60D", Cloudy, -1, { 2.115234, 1, 1.427734, 0 } }, + { "Canon", "EOS 60D", Cloudy, 0, { 2.146484, 1, 1.402344, 0 } }, + { "Canon", "EOS 60D", Cloudy, 1, { 2.178711, 1, 1.381836, 0 } }, + { "Canon", "EOS 60D", Cloudy, 2, { 2.211914, 1, 1.361328, 0 } }, + { "Canon", "EOS 60D", Cloudy, 3, { 2.246094, 1, 1.338867, 0 } }, + { "Canon", "EOS 60D", Cloudy, 4, { 2.280273, 1, 1.314453, 0 } }, + { "Canon", "EOS 60D", Cloudy, 5, { 2.322266, 1, 1.292969, 0 } }, + { "Canon", "EOS 60D", Cloudy, 6, { 2.342773, 1, 1.276367, 0 } }, + { "Canon", "EOS 60D", Cloudy, 7, { 2.370117, 1, 1.260742, 0 } }, + { "Canon", "EOS 60D", Cloudy, 8, { 2.403320, 1, 1.243164, 0 } }, + { "Canon", "EOS 60D", Cloudy, 9, { 2.438477, 1, 1.224609, 0 } }, + { "Canon", "EOS 60D", Tungsten, -9, { 1.249023, 1, 2.645508, 0 } }, + { "Canon", "EOS 60D", Tungsten, -8, { 1.265625, 1, 2.619141, 0 } }, + { "Canon", "EOS 60D", Tungsten, -7, { 1.283203, 1, 2.592773, 0 } }, + { "Canon", "EOS 60D", Tungsten, -6, { 1.300781, 1, 2.566406, 0 } }, + { "Canon", "EOS 60D", Tungsten, -5, { 1.319336, 1, 2.534180, 0 } }, + { "Canon", "EOS 60D", Tungsten, -4, { 1.339844, 1, 2.503906, 0 } }, + { "Canon", "EOS 60D", Tungsten, -3, { 1.358398, 1, 2.456055, 0 } }, + { "Canon", "EOS 60D", Tungsten, -2, { 1.375977, 1, 2.403320, 0 } }, + { "Canon", "EOS 60D", Tungsten, -1, { 1.397461, 1, 2.359375, 0 } }, + { "Canon", "EOS 60D", Tungsten, 0, { 1.417969, 1, 2.306641, 0 } }, + { "Canon", "EOS 60D", Tungsten, 1, { 1.438477, 1, 2.270508, 0 } }, + { "Canon", "EOS 60D", Tungsten, 2, { 1.458984, 1, 2.235352, 0 } }, + { "Canon", "EOS 60D", Tungsten, 3, { 1.479492, 1, 2.197266, 0 } }, + { "Canon", "EOS 60D", Tungsten, 4, { 1.501953, 1, 2.160156, 0 } }, + { "Canon", "EOS 60D", Tungsten, 5, { 1.526367, 1, 2.124023, 0 } }, + { "Canon", "EOS 60D", Tungsten, 6, { 1.548828, 1, 2.085938, 0 } }, + { "Canon", "EOS 60D", Tungsten, 7, { 1.570313, 1, 2.051758, 0 } }, + { "Canon", "EOS 60D", Tungsten, 8, { 1.592773, 1, 2.019531, 0 } }, + { "Canon", "EOS 60D", Tungsten, 9, { 1.618164, 1, 1.984375, 0 } }, + { "Canon", "EOS 60D", Fluorescent, -9, { 1.573242, 1, 2.534180, 0 } }, + { "Canon", "EOS 60D", Fluorescent, -8, { 1.594727, 1, 2.498047, 0 } }, + { "Canon", "EOS 60D", Fluorescent, -7, { 1.620117, 1, 2.450195, 0 } }, + { "Canon", "EOS 60D", Fluorescent, -6, { 1.643555, 1, 2.398438, 0 } }, + { "Canon", "EOS 60D", Fluorescent, -5, { 1.665039, 1, 2.348633, 0 } }, + { "Canon", "EOS 60D", Fluorescent, -4, { 1.686523, 1, 2.300781, 0 } }, + { "Canon", "EOS 60D", Fluorescent, -3, { 1.711914, 1, 2.265625, 0 } }, + { "Canon", "EOS 60D", Fluorescent, -2, { 1.738281, 1, 2.230469, 0 } }, + { "Canon", "EOS 60D", Fluorescent, -1, { 1.765625, 1, 2.192383, 0 } }, + { "Canon", "EOS 60D", Fluorescent, 0, { 1.787109, 1, 2.151367, 0 } }, + { "Canon", "EOS 60D", Fluorescent, 1, { 1.812500, 1, 2.115234, 0 } }, + { "Canon", "EOS 60D", Fluorescent, 2, { 1.838867, 1, 2.081055, 0 } }, + { "Canon", "EOS 60D", Fluorescent, 3, { 1.868164, 1, 2.047852, 0 } }, + { "Canon", "EOS 60D", Fluorescent, 4, { 1.896484, 1, 2.011719, 0 } }, + { "Canon", "EOS 60D", Fluorescent, 5, { 1.917969, 1, 1.976563, 0 } }, + { "Canon", "EOS 60D", Fluorescent, 6, { 1.943359, 1, 1.943359, 0 } }, + { "Canon", "EOS 60D", Fluorescent, 7, { 1.968750, 1, 1.914063, 0 } }, + { "Canon", "EOS 60D", Fluorescent, 8, { 1.996094, 1, 1.882813, 0 } }, + { "Canon", "EOS 60D", Fluorescent, 9, { 2.023438, 1, 1.851563, 0 } }, + { "Canon", "EOS 60D", Flash, -9, { 1.950195, 1, 1.627930, 0 } }, + { "Canon", "EOS 60D", Flash, -8, { 1.976563, 1, 1.597656, 0 } }, + { "Canon", "EOS 60D", Flash, -7, { 2.003906, 1, 1.568359, 0 } }, + { "Canon", "EOS 60D", Flash, -6, { 2.032227, 1, 1.537109, 0 } }, + { "Canon", "EOS 60D", Flash, -5, { 2.064453, 1, 1.510742, 0 } }, + { "Canon", "EOS 60D", Flash, -4, { 2.093750, 1, 1.486328, 0 } }, + { "Canon", "EOS 60D", Flash, -3, { 2.124023, 1, 1.462891, 0 } }, + { "Canon", "EOS 60D", Flash, -2, { 2.156250, 1, 1.438477, 0 } }, + { "Canon", "EOS 60D", Flash, -1, { 2.188477, 1, 1.414063, 0 } }, + { "Canon", "EOS 60D", Flash, 0, { 2.216797, 1, 1.391602, 0 } }, + { "Canon", "EOS 60D", Flash, 1, { 2.255859, 1, 1.371094, 0 } }, + { "Canon", "EOS 60D", Flash, 2, { 2.295898, 1, 1.349609, 0 } }, + { "Canon", "EOS 60D", Flash, 3, { 2.327148, 1, 1.326172, 0 } }, + { "Canon", "EOS 60D", Flash, 4, { 2.354492, 1, 1.302734, 0 } }, + { "Canon", "EOS 60D", Flash, 5, { 2.381836, 1, 1.285156, 0 } }, + { "Canon", "EOS 60D", Flash, 6, { 2.415039, 1, 1.268555, 0 } }, + { "Canon", "EOS 60D", Flash, 7, { 2.450195, 1, 1.251953, 0 } }, + { "Canon", "EOS 60D", Flash, 8, { 2.473633, 1, 1.232422, 0 } }, + { "Canon", "EOS 60D", Flash, 9, { 2.503906, 1, 1.214844, 0 } }, /* Canon EOS 70D Firmware Version 1.1.1 */ { "Canon", "EOS 70D", Daylight, 0, { 2.068359, 1, 1.672852, 0 } }, |