Update of /cvsroot/ufraw/ufraw
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv30828

Modified Files:
        wb_presets.c 
Log Message:
Add WB presets and fine-tuning for the Canon EOS 650D family. Use correct model 
name for the Canon EOS M.

Index: wb_presets.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/wb_presets.c,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -d -r1.238 -r1.239
--- wb_presets.c        24 Jan 2013 03:15:12 -0000      1.238
+++ wb_presets.c        29 Jan 2013 15:00:09 -0000      1.239
@@ -1596,6 +1596,64 @@
   { "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 } },
 
+  /* Fine-tuning is the camera's Amber-Blue bracketing. */
+  { "Canon", "EOS 650D", Daylight, -3,         { 1.9502, 1, 1.7539, 0 } },
+  { "Canon", "EOS 650D", Daylight, 0,          { 2.0322, 1, 1.6572, 0 } },
+  { "Canon", "EOS 650D", Daylight, 3,          { 2.1152, 1, 1.5850, 0 } },
+  { "Canon", "EOS 650D", Shade, -3,            { 2.2305, 1, 1.4951, 0 } },
+  { "Canon", "EOS 650D", Shade, 0,             { 2.3379, 1, 1.4238, 0 } },
+  { "Canon", "EOS 650D", Shade, 3,             { 2.4443, 1, 1.3604, 0 } },
+  { "Canon", "EOS 650D", Cloudy, -3,           { 2.0898, 1, 1.6074, 0 } },
+  { "Canon", "EOS 650D", Cloudy, 0,            { 2.1787, 1, 1.5332, 0 } },
+  { "Canon", "EOS 650D", Cloudy, 3,            { 2.2705, 1, 1.4668, 0 } },
+  { "Canon", "EOS 650D", Tungsten, -3,         { 1.3975, 1, 2.5928, 0 } },
+  { "Canon", "EOS 650D", Tungsten, 0,          { 1.4541, 1, 2.4561, 0 } },
+  { "Canon", "EOS 650D", Tungsten, 3,          { 1.5127, 1, 2.3428, 0 } },
+  { "Canon", "EOS 650D", Fluorescent, -3,      { 1.6982, 1, 2.4268, 0 } },
+  { "Canon", "EOS 650D", Fluorescent, 0,       { 1.7715, 1, 2.3066, 0 } },
+  { "Canon", "EOS 650D", Fluorescent, 3,       { 1.8486, 1, 2.1973, 0 } },
+  { "Canon", "EOS 650D", Flash, -3,            { 2.1699, 1, 1.5879, 0 } },
+  { "Canon", "EOS 650D", Flash, 0,             { 2.2607, 1, 1.5166, 0 } },
+  { "Canon", "EOS 650D", Flash, 3,             { 2.3701, 1, 1.4502, 0 } },
+
+  { "Canon", "EOS REBEL T4i", Daylight, -3,    { 1.9502, 1, 1.7539, 0 } },
+  { "Canon", "EOS REBEL T4i", Daylight, 0,     { 2.0322, 1, 1.6572, 0 } },
+  { "Canon", "EOS REBEL T4i", Daylight, 3,     { 2.1152, 1, 1.5850, 0 } },
+  { "Canon", "EOS REBEL T4i", Shade, -3,       { 2.2305, 1, 1.4951, 0 } },
+  { "Canon", "EOS REBEL T4i", Shade, 0,                { 2.3379, 1, 1.4238, 0 
} },
+  { "Canon", "EOS REBEL T4i", Shade, 3,                { 2.4443, 1, 1.3604, 0 
} },
+  { "Canon", "EOS REBEL T4i", Cloudy, -3,      { 2.0898, 1, 1.6074, 0 } },
+  { "Canon", "EOS REBEL T4i", Cloudy, 0,       { 2.1787, 1, 1.5332, 0 } },
+  { "Canon", "EOS REBEL T4i", Cloudy, 3,       { 2.2705, 1, 1.4668, 0 } },
+  { "Canon", "EOS REBEL T4i", Tungsten, -3,    { 1.3975, 1, 2.5928, 0 } },
+  { "Canon", "EOS REBEL T4i", Tungsten, 0,     { 1.4541, 1, 2.4561, 0 } },
+  { "Canon", "EOS REBEL T4i", Tungsten, 3,     { 1.5127, 1, 2.3428, 0 } },
+  { "Canon", "EOS REBEL T4i", Fluorescent, -3, { 1.6982, 1, 2.4268, 0 } },
+  { "Canon", "EOS REBEL T4i", Fluorescent, 0,  { 1.7715, 1, 2.3066, 0 } },
+  { "Canon", "EOS REBEL T4i", Fluorescent, 3,  { 1.8486, 1, 2.1973, 0 } },
+  { "Canon", "EOS REBEL T4i", Flash, -3,       { 2.1699, 1, 1.5879, 0 } },
+  { "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 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 } },
@@ -1676,12 +1734,12 @@
   { "Canon", "EOS-1D Mark IV", Flash, 0,       { 2.230469, 1, 1.423828, 0 } },
 
   // Canon EOS M Firmware 1.0.6
-  { "Canon", "EOS", Cloudy, 0,                 { 2.156250, 1, 1.448242, 0 } },
-  { "Canon", "EOS", Daylight, 0,               { 2.007813, 1, 1.575195, 0 } },
-  { "Canon", "EOS", Flash, 0,                  { 2.230469, 1, 1.429688, 0 } },
-  { "Canon", "EOS", Tungsten, 0,               { 1.448242, 1, 2.386719, 0 } },
-  { "Canon", "EOS", Shade, 0,                  { 2.300781, 1, 1.334961, 0 } },
-  { "Canon", "EOS", Fluorescent, 0,            { 1.784180, 1, 2.275391, 0 } },
+  { "Canon", "EOS M", Cloudy, 0,               { 2.156250, 1, 1.448242, 0 } },
+  { "Canon", "EOS M", Daylight, 0,             { 2.007813, 1, 1.575195, 0 } },
+  { "Canon", "EOS M", Flash, 0,                        { 2.230469, 1, 
1.429688, 0 } },
+  { "Canon", "EOS M", Tungsten, 0,             { 1.448242, 1, 2.386719, 0 } },
+  { "Canon", "EOS M", Shade, 0,                        { 2.300781, 1, 
1.334961, 0 } },
+  { "Canon", "EOS M", Fluorescent, 0,          { 1.784180, 1, 2.275391, 0 } },
 
   { "FUJIFILM", "E900", Daylight, 0,           { 1.571875, 1, 1.128125, 0 } },
   { "FUJIFILM", "E900", Shade, 0,              { 1.668750, 1, 1.006250, 0 } },


------------------------------------------------------------------------------
Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS,
MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current
with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft
MVPs and experts. ON SALE this month only -- learn more at:
http://p.sf.net/sfu/learnnow-d2d
_______________________________________________
ufraw-cvs mailing list
ufraw-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs

Reply via email to