Update of /cvsroot/ufraw/ufraw In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv22579
Modified Files: wb_presets.c Log Message: Add WB presets and fine tuning for Canon EOS 100D and Canon EOS 700D. Stolen from Darktable. Index: wb_presets.c =================================================================== RCS file: /cvsroot/ufraw/ufraw/wb_presets.c,v retrieving revision 1.253 retrieving revision 1.254 diff -u -d -r1.253 -r1.254 --- wb_presets.c 31 May 2013 08:00:13 -0000 1.253 +++ wb_presets.c 2 Jun 2013 02:30:09 -0000 1.254 @@ -758,6 +758,64 @@ { "Canon", "EOS 60D", Fluorescent, 0, { 1.9248, 1, 2.1836, 0 } }, { "Canon", "EOS 60D", Flash, 0, { 2.1514, 1, 1.5420, 0 } }, + // Copied from Canon EOS 650D + { "Canon", "EOS 100D", Daylight, -3, { 1.9502, 1, 1.7539, 0 } }, + { "Canon", "EOS 100D", Daylight, 0, { 2.0322, 1, 1.6572, 0 } }, + { "Canon", "EOS 100D", Daylight, 3, { 2.1152, 1, 1.5850, 0 } }, + { "Canon", "EOS 100D", Shade, -3, { 2.2305, 1, 1.4951, 0 } }, + { "Canon", "EOS 100D", Shade, 0, { 2.3379, 1, 1.4238, 0 } }, + { "Canon", "EOS 100D", Shade, 3, { 2.4443, 1, 1.3604, 0 } }, + { "Canon", "EOS 100D", Cloudy, -3, { 2.0898, 1, 1.6074, 0 } }, + { "Canon", "EOS 100D", Cloudy, 0, { 2.1787, 1, 1.5332, 0 } }, + { "Canon", "EOS 100D", Cloudy, 3, { 2.2705, 1, 1.4668, 0 } }, + { "Canon", "EOS 100D", Tungsten, -3, { 1.3975, 1, 2.5928, 0 } }, + { "Canon", "EOS 100D", Tungsten, 0, { 1.4541, 1, 2.4561, 0 } }, + { "Canon", "EOS 100D", Tungsten, 3, { 1.5127, 1, 2.3428, 0 } }, + { "Canon", "EOS 100D", Fluorescent, -3, { 1.6982, 1, 2.4268, 0 } }, + { "Canon", "EOS 100D", Fluorescent, 0, { 1.7715, 1, 2.3066, 0 } }, + { "Canon", "EOS 100D", Fluorescent, 3, { 1.8486, 1, 2.1973, 0 } }, + { "Canon", "EOS 100D", Flash, -3, { 2.1699, 1, 1.5879, 0 } }, + { "Canon", "EOS 100D", Flash, 0, { 2.2607, 1, 1.5166, 0 } }, + { "Canon", "EOS 100D", Flash, 3, { 2.3701, 1, 1.4502, 0 } }, + + { "Canon", "EOS REBEL SL1", Daylight, -3, { 1.9502, 1, 1.7539, 0 } }, + { "Canon", "EOS REBEL SL1", Daylight, 0, { 2.0322, 1, 1.6572, 0 } }, + { "Canon", "EOS REBEL SL1", Daylight, 3, { 2.1152, 1, 1.5850, 0 } }, + { "Canon", "EOS REBEL SL1", Shade, -3, { 2.2305, 1, 1.4951, 0 } }, + { "Canon", "EOS REBEL SL1", Shade, 0, { 2.3379, 1, 1.4238, 0 } }, + { "Canon", "EOS REBEL SL1", Shade, 3, { 2.4443, 1, 1.3604, 0 } }, + { "Canon", "EOS REBEL SL1", Cloudy, -3, { 2.0898, 1, 1.6074, 0 } }, + { "Canon", "EOS REBEL SL1", Cloudy, 0, { 2.1787, 1, 1.5332, 0 } }, + { "Canon", "EOS REBEL SL1", Cloudy, 3, { 2.2705, 1, 1.4668, 0 } }, + { "Canon", "EOS REBEL SL1", Tungsten, -3, { 1.3975, 1, 2.5928, 0 } }, + { "Canon", "EOS REBEL SL1", Tungsten, 0, { 1.4541, 1, 2.4561, 0 } }, + { "Canon", "EOS REBEL SL1", Tungsten, 3, { 1.5127, 1, 2.3428, 0 } }, + { "Canon", "EOS REBEL SL1", Fluorescent, -3, { 1.6982, 1, 2.4268, 0 } }, + { "Canon", "EOS REBEL SL1", Fluorescent, 0, { 1.7715, 1, 2.3066, 0 } }, + { "Canon", "EOS REBEL SL1", Fluorescent, 3, { 1.8486, 1, 2.1973, 0 } }, + { "Canon", "EOS REBEL SL1", Flash, -3, { 2.1699, 1, 1.5879, 0 } }, + { "Canon", "EOS REBEL SL1", Flash, 0, { 2.2607, 1, 1.5166, 0 } }, + { "Canon", "EOS REBEL SL1", Flash, 3, { 2.3701, 1, 1.4502, 0 } }, + + { "Canon", "EOS Kiss X7", Daylight, -3, { 1.9502, 1, 1.7539, 0 } }, + { "Canon", "EOS Kiss X7", Daylight, 0, { 2.0322, 1, 1.6572, 0 } }, + { "Canon", "EOS Kiss X7", Daylight, 3, { 2.1152, 1, 1.5850, 0 } }, + { "Canon", "EOS Kiss X7", Shade, -3, { 2.2305, 1, 1.4951, 0 } }, + { "Canon", "EOS Kiss X7", Shade, 0, { 2.3379, 1, 1.4238, 0 } }, + { "Canon", "EOS Kiss X7", Shade, 3, { 2.4443, 1, 1.3604, 0 } }, + { "Canon", "EOS Kiss X7", Cloudy, -3, { 2.0898, 1, 1.6074, 0 } }, + { "Canon", "EOS Kiss X7", Cloudy, 0, { 2.1787, 1, 1.5332, 0 } }, + { "Canon", "EOS Kiss X7", Cloudy, 3, { 2.2705, 1, 1.4668, 0 } }, + { "Canon", "EOS Kiss X7", Tungsten, -3, { 1.3975, 1, 2.5928, 0 } }, + { "Canon", "EOS Kiss X7", Tungsten, 0, { 1.4541, 1, 2.4561, 0 } }, + { "Canon", "EOS Kiss X7", Tungsten, 3, { 1.5127, 1, 2.3428, 0 } }, + { "Canon", "EOS Kiss X7", Fluorescent, -3, { 1.6982, 1, 2.4268, 0 } }, + { "Canon", "EOS Kiss X7", Fluorescent, 0, { 1.7715, 1, 2.3066, 0 } }, + { "Canon", "EOS Kiss X7", Fluorescent, 3, { 1.8486, 1, 2.1973, 0 } }, + { "Canon", "EOS Kiss X7", Flash, -3, { 2.1699, 1, 1.5879, 0 } }, + { "Canon", "EOS Kiss X7", Flash, 0, { 2.2607, 1, 1.5166, 0 } }, + { "Canon", "EOS Kiss X7", Flash, 3, { 2.3701, 1, 1.4502, 0 } }, + { "Canon", "EOS 300D DIGITAL", Daylight, 0, { 2.072115, 1, 1.217548, 0 } }, { "Canon", "EOS 300D DIGITAL", Shade, 0, { 2.455529, 1, 1.026442, 0 } }, { "Canon", "EOS 300D DIGITAL", Cloudy, 0, { 2.254808, 1, 1.108173, 0 } }, @@ -1654,6 +1712,64 @@ { "Canon", "EOS Kiss X6i", Flash, 0, { 2.2607, 1, 1.5166, 0 } }, { "Canon", "EOS Kiss X6i", Flash, 3, { 2.3701, 1, 1.4502, 0 } }, + // Copied from Canon EOS 650D + { "Canon", "EOS 700D", Daylight, -3, { 1.9502, 1, 1.7539, 0 } }, + { "Canon", "EOS 700D", Daylight, 0, { 2.0322, 1, 1.6572, 0 } }, + { "Canon", "EOS 700D", Daylight, 3, { 2.1152, 1, 1.5850, 0 } }, + { "Canon", "EOS 700D", Shade, -3, { 2.2305, 1, 1.4951, 0 } }, + { "Canon", "EOS 700D", Shade, 0, { 2.3379, 1, 1.4238, 0 } }, + { "Canon", "EOS 700D", Shade, 3, { 2.4443, 1, 1.3604, 0 } }, + { "Canon", "EOS 700D", Cloudy, -3, { 2.0898, 1, 1.6074, 0 } }, + { "Canon", "EOS 700D", Cloudy, 0, { 2.1787, 1, 1.5332, 0 } }, + { "Canon", "EOS 700D", Cloudy, 3, { 2.2705, 1, 1.4668, 0 } }, + { "Canon", "EOS 700D", Tungsten, -3, { 1.3975, 1, 2.5928, 0 } }, + { "Canon", "EOS 700D", Tungsten, 0, { 1.4541, 1, 2.4561, 0 } }, + { "Canon", "EOS 700D", Tungsten, 3, { 1.5127, 1, 2.3428, 0 } }, + { "Canon", "EOS 700D", Fluorescent, -3, { 1.6982, 1, 2.4268, 0 } }, + { "Canon", "EOS 700D", Fluorescent, 0, { 1.7715, 1, 2.3066, 0 } }, + { "Canon", "EOS 700D", Fluorescent, 3, { 1.8486, 1, 2.1973, 0 } }, + { "Canon", "EOS 700D", Flash, -3, { 2.1699, 1, 1.5879, 0 } }, + { "Canon", "EOS 700D", Flash, 0, { 2.2607, 1, 1.5166, 0 } }, + { "Canon", "EOS 700D", Flash, 3, { 2.3701, 1, 1.4502, 0 } }, + + { "Canon", "EOS REBEL T5i", Daylight, -3, { 1.9502, 1, 1.7539, 0 } }, + { "Canon", "EOS REBEL T5i", Daylight, 0, { 2.0322, 1, 1.6572, 0 } }, + { "Canon", "EOS REBEL T5i", Daylight, 3, { 2.1152, 1, 1.5850, 0 } }, + { "Canon", "EOS REBEL T5i", Shade, -3, { 2.2305, 1, 1.4951, 0 } }, + { "Canon", "EOS REBEL T5i", Shade, 0, { 2.3379, 1, 1.4238, 0 } }, + { "Canon", "EOS REBEL T5i", Shade, 3, { 2.4443, 1, 1.3604, 0 } }, + { "Canon", "EOS REBEL T5i", Cloudy, -3, { 2.0898, 1, 1.6074, 0 } }, + { "Canon", "EOS REBEL T5i", Cloudy, 0, { 2.1787, 1, 1.5332, 0 } }, + { "Canon", "EOS REBEL T5i", Cloudy, 3, { 2.2705, 1, 1.4668, 0 } }, + { "Canon", "EOS REBEL T5i", Tungsten, -3, { 1.3975, 1, 2.5928, 0 } }, + { "Canon", "EOS REBEL T5i", Tungsten, 0, { 1.4541, 1, 2.4561, 0 } }, + { "Canon", "EOS REBEL T5i", Tungsten, 3, { 1.5127, 1, 2.3428, 0 } }, + { "Canon", "EOS REBEL T5i", Fluorescent, -3, { 1.6982, 1, 2.4268, 0 } }, + { "Canon", "EOS REBEL T5i", Fluorescent, 0, { 1.7715, 1, 2.3066, 0 } }, + { "Canon", "EOS REBEL T5i", Fluorescent, 3, { 1.8486, 1, 2.1973, 0 } }, + { "Canon", "EOS REBEL T5i", Flash, -3, { 2.1699, 1, 1.5879, 0 } }, + { "Canon", "EOS REBEL T5i", Flash, 0, { 2.2607, 1, 1.5166, 0 } }, + { "Canon", "EOS REBEL T5i", Flash, 3, { 2.3701, 1, 1.4502, 0 } }, + + { "Canon", "EOS Kiss X7i", Daylight, -3, { 1.9502, 1, 1.7539, 0 } }, + { "Canon", "EOS Kiss X7i", Daylight, 0, { 2.0322, 1, 1.6572, 0 } }, + { "Canon", "EOS Kiss X7i", Daylight, 3, { 2.1152, 1, 1.5850, 0 } }, + { "Canon", "EOS Kiss X7i", Shade, -3, { 2.2305, 1, 1.4951, 0 } }, + { "Canon", "EOS Kiss X7i", Shade, 0, { 2.3379, 1, 1.4238, 0 } }, + { "Canon", "EOS Kiss X7i", Shade, 3, { 2.4443, 1, 1.3604, 0 } }, + { "Canon", "EOS Kiss X7i", Cloudy, -3, { 2.0898, 1, 1.6074, 0 } }, + { "Canon", "EOS Kiss X7i", Cloudy, 0, { 2.1787, 1, 1.5332, 0 } }, + { "Canon", "EOS Kiss X7i", Cloudy, 3, { 2.2705, 1, 1.4668, 0 } }, + { "Canon", "EOS Kiss X7i", Tungsten, -3, { 1.3975, 1, 2.5928, 0 } }, + { "Canon", "EOS Kiss X7i", Tungsten, 0, { 1.4541, 1, 2.4561, 0 } }, + { "Canon", "EOS Kiss X7i", Tungsten, 3, { 1.5127, 1, 2.3428, 0 } }, + { "Canon", "EOS Kiss X7i", Fluorescent, -3, { 1.6982, 1, 2.4268, 0 } }, + { "Canon", "EOS Kiss X7i", Fluorescent, 0, { 1.7715, 1, 2.3066, 0 } }, + { "Canon", "EOS Kiss X7i", Fluorescent, 3, { 1.8486, 1, 2.1973, 0 } }, + { "Canon", "EOS Kiss X7i", Flash, -3, { 2.1699, 1, 1.5879, 0 } }, + { "Canon", "EOS Kiss X7i", Flash, 0, { 2.2607, 1, 1.5166, 0 } }, + { "Canon", "EOS Kiss X7i", 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 } }, { "Canon", "EOS 1000D", Cloudy, 0, { 2.365234, 1, 1.375977, 0 } }, ------------------------------------------------------------------------------ Get 100% visibility into Java/.NET code with AppDynamics Lite It's a free troubleshooting tool designed for production Get down to code-level detail for bottlenecks, with <2% overhead. Download for free and get started troubleshooting in minutes. http://p.sf.net/sfu/appdyn_d2d_ap2 _______________________________________________ ufraw-cvs mailing list ufraw-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/ufraw-cvs