Update of /cvsroot/ufraw/ufraw
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv5989
Modified Files:
wb_presets.c
Log Message:
Make consistent names of fluorescent WB presets for Canon cameras.
Index: wb_presets.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/wb_presets.c,v
retrieving revision 1.357
retrieving revision 1.358
diff -u -d -r1.357 -r1.358
--- wb_presets.c 6 Aug 2016 04:00:35 -0000 1.357
+++ wb_presets.c 7 Aug 2016 05:00:08 -0000 1.358
@@ -79,7 +79,7 @@
{ "Canon", "PowerShot A710 IS", Cloudy, 0, { 1.871320, 1, 1.718648, 0 } },
{ "Canon", "PowerShot A710 IS", Tungsten, 0, { 1.268692, 1, 2.707944, 0 } },
{ "Canon", "PowerShot A710 IS", Fluorescent, 0, { 1.589857, 1, 2.051819, 0 }
},
- { "Canon", "PowerShot A710 IS", DaylightFluorescent, 0, { 1.820287, 1,
1.820287, 0 } },
+ { "Canon", "PowerShot A710 IS", FluorescentHigh, 0, { 1.820287, 1, 1.820287,
0 } },
{ "Canon", "PowerShot A710 IS", Underwater, 0, { 2.926108, 1, 1.376847, 0 }
},
/* These presets were extracted from CHDK-generated DNG files. */
@@ -242,25 +242,25 @@
{ "Canon", "PowerShot G7 X", Fluorescent, 7, { 2.434457, 1, 1.957553, 0 } },
{ "Canon", "PowerShot G7 X", Fluorescent, 8, { 2.488722, 1, 1.921053, 0 } },
{ "Canon", "PowerShot G7 X", Fluorescent, 9, { 2.547051, 1, 1.870765, 0 } },
- { "Canon", "PowerShot G7 X", DaylightFluorescent, -9, { 2.137845, 1,
2.271930, 0 } },
- { "Canon", "PowerShot G7 X", DaylightFluorescent, -8, { 2.186017, 1,
2.203496, 0 } },
- { "Canon", "PowerShot G7 X", DaylightFluorescent, -7, { 2.238155, 1,
2.142145, 0 } },
- { "Canon", "PowerShot G7 X", DaylightFluorescent, -6, { 2.288917, 1,
2.080946, 0 } },
- { "Canon", "PowerShot G7 X", DaylightFluorescent, -5, { 2.348039, 1,
2.015931, 0 } },
- { "Canon", "PowerShot G7 X", DaylightFluorescent, -4, { 2.413965, 1,
1.967581, 0 } },
- { "Canon", "PowerShot G7 X", DaylightFluorescent, -3, { 2.460674, 1,
1.930087, 0 } },
- { "Canon", "PowerShot G7 X", DaylightFluorescent, -2, { 2.513750, 1,
1.885000, 0 } },
- { "Canon", "PowerShot G7 X", DaylightFluorescent, -1, { 2.576441, 1,
1.835840, 0 } },
- { "Canon", "PowerShot G7 X", DaylightFluorescent, 0, { 2.637390, 1,
1.784191, 0 } },
- { "Canon", "PowerShot G7 X", DaylightFluorescent, 1, { 2.700629, 1,
1.738365, 0 } },
- { "Canon", "PowerShot G7 X", DaylightFluorescent, 2, { 2.790139, 1,
1.677623, 0 } },
- { "Canon", "PowerShot G7 X", DaylightFluorescent, 3, { 2.891858, 1,
1.618321, 0 } },
- { "Canon", "PowerShot G7 X", DaylightFluorescent, 4, { 3.001282, 1,
1.561538, 0 } },
- { "Canon", "PowerShot G7 X", DaylightFluorescent, 5, { 3.157143, 1,
1.494805, 0 } },
- { "Canon", "PowerShot G7 X", DaylightFluorescent, 6, { 3.352318, 1,
1.426490, 0 } },
- { "Canon", "PowerShot G7 X", DaylightFluorescent, 7, { 3.576662, 1,
1.366350, 0 } },
- { "Canon", "PowerShot G7 X", DaylightFluorescent, 8, { 3.911392, 1,
1.288326, 0 } },
- { "Canon", "PowerShot G7 X", DaylightFluorescent, 9, { 4.358519, 1,
1.223704, 0 } },
+ { "Canon", "PowerShot G7 X", FluorescentHigh, -9, { 2.137845, 1, 2.271930, 0
} },
+ { "Canon", "PowerShot G7 X", FluorescentHigh, -8, { 2.186017, 1, 2.203496, 0
} },
+ { "Canon", "PowerShot G7 X", FluorescentHigh, -7, { 2.238155, 1, 2.142145, 0
} },
+ { "Canon", "PowerShot G7 X", FluorescentHigh, -6, { 2.288917, 1, 2.080946, 0
} },
+ { "Canon", "PowerShot G7 X", FluorescentHigh, -5, { 2.348039, 1, 2.015931, 0
} },
+ { "Canon", "PowerShot G7 X", FluorescentHigh, -4, { 2.413965, 1, 1.967581, 0
} },
+ { "Canon", "PowerShot G7 X", FluorescentHigh, -3, { 2.460674, 1, 1.930087, 0
} },
+ { "Canon", "PowerShot G7 X", FluorescentHigh, -2, { 2.513750, 1, 1.885000, 0
} },
+ { "Canon", "PowerShot G7 X", FluorescentHigh, -1, { 2.576441, 1, 1.835840, 0
} },
+ { "Canon", "PowerShot G7 X", FluorescentHigh, 0, { 2.637390, 1, 1.784191, 0
} },
+ { "Canon", "PowerShot G7 X", FluorescentHigh, 1, { 2.700629, 1, 1.738365, 0
} },
+ { "Canon", "PowerShot G7 X", FluorescentHigh, 2, { 2.790139, 1, 1.677623, 0
} },
+ { "Canon", "PowerShot G7 X", FluorescentHigh, 3, { 2.891858, 1, 1.618321, 0
} },
+ { "Canon", "PowerShot G7 X", FluorescentHigh, 4, { 3.001282, 1, 1.561538, 0
} },
+ { "Canon", "PowerShot G7 X", FluorescentHigh, 5, { 3.157143, 1, 1.494805, 0
} },
+ { "Canon", "PowerShot G7 X", FluorescentHigh, 6, { 3.352318, 1, 1.426490, 0
} },
+ { "Canon", "PowerShot G7 X", FluorescentHigh, 7, { 3.576662, 1, 1.366350, 0
} },
+ { "Canon", "PowerShot G7 X", FluorescentHigh, 8, { 3.911392, 1, 1.288326, 0
} },
+ { "Canon", "PowerShot G7 X", FluorescentHigh, 9, { 4.358519, 1, 1.223704, 0
} },
{ "Canon", "PowerShot G7 X", Flash, -9, { 2.063564, 1, 1.745743, 0 } },
{ "Canon", "PowerShot G7 X", Flash, -8, { 2.097616, 1, 1.711691, 0 } },
{ "Canon", "PowerShot G7 X", Flash, -7, { 2.137500, 1, 1.678409, 0 } },
@@ -480,7 +480,7 @@
{ "Canon", "EOS D60", Flash, 0, { 2.829840, 1, 1.108508, 0 } },
{ "Canon", "EOS 5D", Flash, 0, { 2.211914, 1, 1.260742, 0 } },
/*6550K*/
- { "Canon", "EOS 5D", Fluorescent, 0, { 1.726054, 1, 2.088123, 0 } },
/*3850K*/
+ { "Canon", "EOS 5D", WhiteFluorescent, 0, { 1.726054, 1, 2.088123, 0 } },
/*3850K*/
{ "Canon", "EOS 5D", Tungsten, 0, { 1.373285, 1, 2.301006, 0 } },
/*3250K*/
{ "Canon", "EOS 5D", Cloudy, 0, { 2.151367, 1, 1.321289, 0 } },
/*6100K*/
{ "Canon", "EOS 5D", Shade, 0, { 2.300781, 1, 1.208008, 0 } },
/*7200K*/
@@ -563,25 +563,25 @@
{ "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.849590, 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.716790, 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.841760, 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.156250, 1, 2.081055, 0 } },
+ { "Canon", "EOS 5D Mark II", WhiteFluorescent, -9, { 1.669691, 1, 2.900181,
0 } },
+ { "Canon", "EOS 5D Mark II", WhiteFluorescent, -8, { 1.695533, 1, 2.849590,
0 } },
+ { "Canon", "EOS 5D Mark II", WhiteFluorescent, -7, { 1.717033, 1, 2.806777,
0 } },
+ { "Canon", "EOS 5D Mark II", WhiteFluorescent, -6, { 1.740809, 1, 2.761029,
0 } },
+ { "Canon", "EOS 5D Mark II", WhiteFluorescent, -5, { 1.765683, 1, 2.716790,
0 } },
+ { "Canon", "EOS 5D Mark II", WhiteFluorescent, -4, { 1.794063, 1, 2.667904,
0 } },
+ { "Canon", "EOS 5D Mark II", WhiteFluorescent, -3, { 1.820298, 1, 2.619181,
0 } },
+ { "Canon", "EOS 5D Mark II", WhiteFluorescent, -2, { 1.841760, 1, 2.567416,
0 } },
+ { "Canon", "EOS 5D Mark II", WhiteFluorescent, -1, { 1.870056, 1, 2.516949,
0 } },
+ { "Canon", "EOS 5D Mark II", WhiteFluorescent, 0, { 1.895833, 1, 2.461174, 0
} },
+ { "Canon", "EOS 5D Mark II", WhiteFluorescent, 1, { 1.928503, 1, 2.416587, 0
} },
+ { "Canon", "EOS 5D Mark II", WhiteFluorescent, 2, { 1.956772, 1, 2.365994, 0
} },
+ { "Canon", "EOS 5D Mark II", WhiteFluorescent, 3, { 1.978744, 1, 2.320773, 0
} },
+ { "Canon", "EOS 5D Mark II", WhiteFluorescent, 4, { 2.009718, 1, 2.281827, 0
} },
+ { "Canon", "EOS 5D Mark II", WhiteFluorescent, 5, { 2.036133, 1, 2.240234, 0
} },
+ { "Canon", "EOS 5D Mark II", WhiteFluorescent, 6, { 2.068359, 1, 2.197266, 0
} },
+ { "Canon", "EOS 5D Mark II", WhiteFluorescent, 7, { 2.098633, 1, 2.160156, 0
} },
+ { "Canon", "EOS 5D Mark II", WhiteFluorescent, 8, { 2.128906, 1, 2.120117, 0
} },
+ { "Canon", "EOS 5D Mark II", WhiteFluorescent, 9, { 2.156250, 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 } },
@@ -738,7 +738,7 @@
{ "Canon", "EOS 6D", Shade, 0, { 2.265625, 1, 1.371094, 0 } },
{ "Canon", "EOS 6D", Cloudy, 0, { 2.128906, 1, 1.497070, 0 } },
{ "Canon", "EOS 6D", Tungsten, 0, { 1.412109, 1, 2.473633, 0 } },
- { "Canon", "EOS 6D", Fluorescent, 0, { 1.726562, 1, 2.337891, 0 } },
+ { "Canon", "EOS 6D", WhiteFluorescent, 0, { 1.726562, 1, 2.337891, 0 } },
{ "Canon", "EOS 6D", Flash, 0, { 2.192383, 1, 1.458984, 0 } },
/* Canon EOS 7D Firmware Version 2.0.3 */
@@ -862,35 +862,35 @@
{ "Canon", "EOS 7D Mark II", Shade, 0, { 2.240234, 1, 1.410156, 0 } },
{ "Canon", "EOS 7D Mark II", Cloudy, 0, { 2.093750, 1, 1.519531, 0 } },
{ "Canon", "EOS 7D Mark II", Tungsten, 0, { 1.373047, 1, 2.342773, 0 } },
- { "Canon", "EOS 7D Mark II", Fluorescent, 0, { 1.717773, 1, 2.250977, 0 } },
+ { "Canon", "EOS 7D Mark II", WhiteFluorescent, 0, { 1.717773, 1, 2.250977, 0
} },
{ "Canon", "EOS 7D Mark II", Flash, 0, { 2.160156, 1, 1.488281, 0 } },
{ "Canon", "EOS 10D", Daylight, 0, { 2.159856, 1, 1.218750, 0 } },
{ "Canon", "EOS 10D", Shade, 0, { 2.533654, 1, 1.036058, 0 } },
{ "Canon", "EOS 10D", Cloudy, 0, { 2.348558, 1, 1.116587, 0 } },
{ "Canon", "EOS 10D", Tungsten, 0, { 1.431544, 1, 1.851040, 0 } },
- { "Canon", "EOS 10D", Fluorescent, 0, { 1.891509, 1,
1.647406, 0 } },
+ { "Canon", "EOS 10D", WhiteFluorescent, 0, { 1.891509, 1, 1.647406, 0 } },
{ "Canon", "EOS 10D", Flash, 0, { 2.385817, 1, 1.115385, 0 } },
{ "Canon", "EOS 20D", Daylight, 0, { 1.954680, 1, 1.478818, 0 } },
{ "Canon", "EOS 20D", Shade, 0, { 2.248276, 1, 1.227586, 0 } },
{ "Canon", "EOS 20D", Cloudy, 0, { 2.115271, 1, 1.336946, 0 } },
{ "Canon", "EOS 20D", Tungsten, 0, { 1.368087, 1, 2.417044, 0 } },
- { "Canon", "EOS 20D", Fluorescent, 0, { 1.752709, 1,
2.060098, 0 } },
+ { "Canon", "EOS 20D", WhiteFluorescent, 0, { 1.752709, 1, 2.060098, 0 } },
{ "Canon", "EOS 20D", Flash, 0, { 2.145813, 1, 1.293596, 0 } },
{ "Canon", "EOS 30D", Daylight, 0, { 2.032227, 1, 1.537109, 0 } },
{ "Canon", "EOS 30D", Shade, 0, { 2.354492, 1, 1.264648, 0 } },
{ "Canon", "EOS 30D", Cloudy, 0, { 2.197266, 1, 1.389648, 0 } },
{ "Canon", "EOS 30D", Tungsten, 0, { 1.411084, 1, 2.447477, 0 } },
- { "Canon", "EOS 30D", Fluorescent, 0, { 1.761601, 1,
2.303913, 0 } },
+ { "Canon", "EOS 30D", WhiteFluorescent, 0, { 1.761601, 1, 2.303913, 0 } },
{ "Canon", "EOS 30D", Flash, 0, { 2.226562, 1, 1.347656, 0 } },
{ "Canon", "EOS 40D", Daylight, 0, { 2.197266, 1, 1.438477, 0 } },
{ "Canon", "EOS 40D", Shade, 0, { 2.546875, 1, 1.185547, 0 } },
{ "Canon", "EOS 40D", Cloudy, 0, { 2.370117, 1, 1.290039, 0 } },
{ "Canon", "EOS 40D", Tungsten, 0, { 1.510563, 1, 2.235915, 0 } },
- { "Canon", "EOS 40D", Fluorescent, 0, { 2.019084, 1,
2.129771, 0 } },
+ { "Canon", "EOS 40D", WhiteFluorescent, 0, { 2.019084, 1, 2.129771, 0 } },
{ "Canon", "EOS 40D", Flash, 0, { 2.409180, 1, 1.260742, 0 } },
// Canon EOS 50D (firmware 1.0.3)
@@ -1088,25 +1088,25 @@
{ "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", WhiteFluorescent, -9, { 1.573242, 1, 2.534180, 0 } },
+ { "Canon", "EOS 60D", WhiteFluorescent, -8, { 1.594727, 1, 2.498047, 0 } },
+ { "Canon", "EOS 60D", WhiteFluorescent, -7, { 1.620117, 1, 2.450195, 0 } },
+ { "Canon", "EOS 60D", WhiteFluorescent, -6, { 1.643555, 1, 2.398438, 0 } },
+ { "Canon", "EOS 60D", WhiteFluorescent, -5, { 1.665039, 1, 2.348633, 0 } },
+ { "Canon", "EOS 60D", WhiteFluorescent, -4, { 1.686523, 1, 2.300781, 0 } },
+ { "Canon", "EOS 60D", WhiteFluorescent, -3, { 1.711914, 1, 2.265625, 0 } },
+ { "Canon", "EOS 60D", WhiteFluorescent, -2, { 1.738281, 1, 2.230469, 0 } },
+ { "Canon", "EOS 60D", WhiteFluorescent, -1, { 1.765625, 1, 2.192383, 0 } },
+ { "Canon", "EOS 60D", WhiteFluorescent, 0, { 1.787109, 1, 2.151367, 0 } },
+ { "Canon", "EOS 60D", WhiteFluorescent, 1, { 1.812500, 1, 2.115234, 0 } },
+ { "Canon", "EOS 60D", WhiteFluorescent, 2, { 1.838867, 1, 2.081055, 0 } },
+ { "Canon", "EOS 60D", WhiteFluorescent, 3, { 1.868164, 1, 2.047852, 0 } },
+ { "Canon", "EOS 60D", WhiteFluorescent, 4, { 1.896484, 1, 2.011719, 0 } },
+ { "Canon", "EOS 60D", WhiteFluorescent, 5, { 1.917969, 1, 1.976563, 0 } },
+ { "Canon", "EOS 60D", WhiteFluorescent, 6, { 1.943359, 1, 1.943359, 0 } },
+ { "Canon", "EOS 60D", WhiteFluorescent, 7, { 1.968750, 1, 1.914063, 0 } },
+ { "Canon", "EOS 60D", WhiteFluorescent, 8, { 1.996094, 1, 1.882813, 0 } },
+ { "Canon", "EOS 60D", WhiteFluorescent, 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 } },
@@ -1132,7 +1132,7 @@
{ "Canon", "EOS 70D", Shade, 0, { 2.403320, 1, 1.446289, 0 } },
{ "Canon", "EOS 70D", Cloudy, 0, { 2.226563, 1, 1.551758, 0 } },
{ "Canon", "EOS 70D", Tungsten, 0, { 1.448242, 1, 2.409180, 0 } },
- { "Canon", "EOS 70D", Fluorescent, 0, { 1.790039, 1,
2.280273, 0 } },
+ { "Canon", "EOS 70D", WhiteFluorescent, 0, { 1.790039, 1, 2.280273, 0 } },
{ "Canon", "EOS 70D", Flash, 0, { 2.286133, 1, 1.548828, 0 } },
/* Canon EOS 80D Firmware Version Ver.1.0.1 */
@@ -1213,25 +1213,25 @@
{ "Canon", "EOS 80D", Tungsten, 7, { 1.383789, 1, 2.137695, 0 } },
{ "Canon", "EOS 80D", Tungsten, 8, { 1.404297, 1, 2.102539, 0 } },
{ "Canon", "EOS 80D", Tungsten, 9, { 1.425781, 1, 2.073242, 0 } },
- { "Canon", "EOS 80D", Fluorescent, -9, { 1.291016, 1, 2.559570, 0 } },
- { "Canon", "EOS 80D", Fluorescent, -8, { 1.311523, 1, 2.522461, 0 } },
- { "Canon", "EOS 80D", Fluorescent, -7, { 1.332031, 1, 2.479492, 0 } },
- { "Canon", "EOS 80D", Fluorescent, -6, { 1.354492, 1, 2.438477, 0 } },
- { "Canon", "EOS 80D", Fluorescent, -5, { 1.373047, 1, 2.398438, 0 } },
- { "Canon", "EOS 80D", Fluorescent, -4, { 1.393555, 1, 2.359375, 0 } },
- { "Canon", "EOS 80D", Fluorescent, -3, { 1.414063, 1, 2.327148, 0 } },
- { "Canon", "EOS 80D", Fluorescent, -2, { 1.438477, 1, 2.291016, 0 } },
- { "Canon", "EOS 80D", Fluorescent, -1, { 1.458984, 1, 2.255859, 0 } },
- { "Canon", "EOS 80D", Fluorescent, 0, { 1.475586, 1,
2.216797, 0 } },
- { "Canon", "EOS 80D", Fluorescent, 1, { 1.495117, 1,
2.183594, 0 } },
- { "Canon", "EOS 80D", Fluorescent, 2, { 1.516602, 1,
2.151367, 0 } },
- { "Canon", "EOS 80D", Fluorescent, 3, { 1.540039, 1,
2.120117, 0 } },
- { "Canon", "EOS 80D", Fluorescent, 4, { 1.560547, 1,
2.085938, 0 } },
- { "Canon", "EOS 80D", Fluorescent, 5, { 1.583008, 1,
2.051758, 0 } },
- { "Canon", "EOS 80D", Fluorescent, 6, { 1.605469, 1,
2.023438, 0 } },
- { "Canon", "EOS 80D", Fluorescent, 7, { 1.630859, 1,
1.996094, 0 } },
- { "Canon", "EOS 80D", Fluorescent, 8, { 1.657227, 1,
1.965820, 0 } },
- { "Canon", "EOS 80D", Fluorescent, 9, { 1.681641, 1,
1.935547, 0 } },
+ { "Canon", "EOS 80D", WhiteFluorescent, -9, { 1.291016, 1, 2.559570, 0 } },
+ { "Canon", "EOS 80D", WhiteFluorescent, -8, { 1.311523, 1, 2.522461, 0 } },
+ { "Canon", "EOS 80D", WhiteFluorescent, -7, { 1.332031, 1, 2.479492, 0 } },
+ { "Canon", "EOS 80D", WhiteFluorescent, -6, { 1.354492, 1, 2.438477, 0 } },
+ { "Canon", "EOS 80D", WhiteFluorescent, -5, { 1.373047, 1, 2.398438, 0 } },
+ { "Canon", "EOS 80D", WhiteFluorescent, -4, { 1.393555, 1, 2.359375, 0 } },
+ { "Canon", "EOS 80D", WhiteFluorescent, -3, { 1.414063, 1, 2.327148, 0 } },
+ { "Canon", "EOS 80D", WhiteFluorescent, -2, { 1.438477, 1, 2.291016, 0 } },
+ { "Canon", "EOS 80D", WhiteFluorescent, -1, { 1.458984, 1, 2.255859, 0 } },
+ { "Canon", "EOS 80D", WhiteFluorescent, 0, { 1.475586, 1, 2.216797, 0 } },
+ { "Canon", "EOS 80D", WhiteFluorescent, 1, { 1.495117, 1, 2.183594, 0 } },
+ { "Canon", "EOS 80D", WhiteFluorescent, 2, { 1.516602, 1, 2.151367, 0 } },
+ { "Canon", "EOS 80D", WhiteFluorescent, 3, { 1.540039, 1, 2.120117, 0 } },
+ { "Canon", "EOS 80D", WhiteFluorescent, 4, { 1.560547, 1, 2.085938, 0 } },
+ { "Canon", "EOS 80D", WhiteFluorescent, 5, { 1.583008, 1, 2.051758, 0 } },
+ { "Canon", "EOS 80D", WhiteFluorescent, 6, { 1.605469, 1, 2.023438, 0 } },
+ { "Canon", "EOS 80D", WhiteFluorescent, 7, { 1.630859, 1, 1.996094, 0 } },
+ { "Canon", "EOS 80D", WhiteFluorescent, 8, { 1.657227, 1, 1.965820, 0 } },
+ { "Canon", "EOS 80D", WhiteFluorescent, 9, { 1.681641, 1, 1.935547, 0 } },
{ "Canon", "EOS 80D", Flash, -9, { 1.720703, 1, 1.720703, 0 } },
{ "Canon", "EOS 80D", Flash, -8, { 1.744141, 1, 1.692383, 0 } },
{ "Canon", "EOS 80D", Flash, -7, { 1.771484, 1, 1.662109, 0 } },
@@ -1265,9 +1265,9 @@
{ "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", WhiteFluorescent, -3, { 1.6982, 1, 2.4268, 0 } },
+ { "Canon", "EOS 100D", WhiteFluorescent, 0, { 1.7715, 1, 2.3066, 0 } },
+ { "Canon", "EOS 100D", WhiteFluorescent, 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 } },
@@ -1284,9 +1284,9 @@
{ "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", WhiteFluorescent, -3, { 1.6982, 1, 2.4268, 0 } },
+ { "Canon", "EOS REBEL SL1", WhiteFluorescent, 0, { 1.7715, 1, 2.3066, 0 } },
+ { "Canon", "EOS REBEL SL1", WhiteFluorescent, 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
} },
@@ -1303,9 +1303,9 @@
{ "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", WhiteFluorescent, -3, { 1.6982, 1, 2.4268, 0 } },
+ { "Canon", "EOS Kiss X7", WhiteFluorescent, 0, { 1.7715, 1, 2.3066, 0 } },
+ { "Canon", "EOS Kiss X7", WhiteFluorescent, 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 } },
@@ -1314,21 +1314,21 @@
{ "Canon", "EOS 300D DIGITAL", Shade, 0, { 2.455529, 1, 1.026442, 0 } },
{ "Canon", "EOS 300D DIGITAL", Cloudy, 0, { 2.254808, 1, 1.108173, 0 } },
{ "Canon", "EOS 300D DIGITAL", Tungsten, 0, { 1.349057, 1, 1.896226, 0 } },
- { "Canon", "EOS 300D DIGITAL", Fluorescent, 0, { 1.794664, 1, 1.711137, 0 }
},
+ { "Canon", "EOS 300D DIGITAL", WhiteFluorescent, 0, { 1.794664, 1, 1.711137,
0 } },
{ "Canon", "EOS 300D DIGITAL", Flash, 0, { 2.326923, 1, 1.098558, 0 } },
{ "Canon", "EOS DIGITAL REBEL", Daylight, 0, { 2.072115, 1, 1.217548, 0 } },
{ "Canon", "EOS DIGITAL REBEL", Shade, 0, { 2.455529, 1, 1.026442, 0 } },
{ "Canon", "EOS DIGITAL REBEL", Cloudy, 0, { 2.254808, 1, 1.108173, 0 } },
{ "Canon", "EOS DIGITAL REBEL", Tungsten, 0, { 1.349057, 1, 1.896226, 0 } },
- { "Canon", "EOS DIGITAL REBEL", Fluorescent, 0, { 1.794664, 1, 1.711137, 0 }
},
+ { "Canon", "EOS DIGITAL REBEL", WhiteFluorescent, 0, { 1.794664, 1,
1.711137, 0 } },
{ "Canon", "EOS DIGITAL REBEL", Flash, 0, { 2.326923, 1, 1.098558, 0 } },
{ "Canon", "EOS Kiss Digital", Daylight, 0, { 2.072115, 1, 1.217548, 0 } },
{ "Canon", "EOS Kiss Digital", Shade, 0, { 2.455529, 1, 1.026442, 0 } },
{ "Canon", "EOS Kiss Digital", Cloudy, 0, { 2.254808, 1, 1.108173, 0 } },
{ "Canon", "EOS Kiss Digital", Tungsten, 0, { 1.349057, 1, 1.896226, 0 } },
- { "Canon", "EOS Kiss Digital", Fluorescent, 0, { 1.794664, 1, 1.711137, 0 }
},
+ { "Canon", "EOS Kiss Digital", WhiteFluorescent, 0, { 1.794664, 1, 1.711137,
0 } },
{ "Canon", "EOS Kiss Digital", Flash, 0, { 2.326923, 1, 1.098558, 0 } },
// Firmware version 1.0.3. Fine tuning is from A9 to B9 on amber-blue.
@@ -1344,9 +1344,9 @@
{ "Canon", "EOS 350D DIGITAL", Tungsten, -9, { 1.5589, 1, 1.9205, 0 } },
{ "Canon", "EOS 350D DIGITAL", Tungsten, 0, { 1.5343, 1, 2.2880, 0 } },
{ "Canon", "EOS 350D DIGITAL", Tungsten, 9, { 1.3145, 1, 2.6873, 0 } },
- { "Canon", "EOS 350D DIGITAL", Fluorescent, -9, { 2.3124, 1, 1.6356, 0 } },
- { "Canon", "EOS 350D DIGITAL", Fluorescent, 0, { 1.9754, 1, 1.9303, 0 } },
- { "Canon", "EOS 350D DIGITAL", Fluorescent, 9, { 1.6657, 1, 2.3034, 0 } },
+ { "Canon", "EOS 350D DIGITAL", WhiteFluorescent, -9, { 2.3124, 1, 1.6356, 0
} },
+ { "Canon", "EOS 350D DIGITAL", WhiteFluorescent, 0, { 1.9754, 1, 1.9303, 0 }
},
+ { "Canon", "EOS 350D DIGITAL", WhiteFluorescent, 9, { 1.6657, 1, 2.3034, 0 }
},
{ "Canon", "EOS 350D DIGITAL", Flash, -9, { 3.0904, 1, 1.0756, 0 } },
{ "Canon", "EOS 350D DIGITAL", Flash, 0, { 2.6729, 1, 1.2613, 0 } },
{ "Canon", "EOS 350D DIGITAL", Flash, 9, { 2.3026, 1, 1.4961, 0 } },
@@ -1364,9 +1364,9 @@
{ "Canon", "EOS DIGITAL REBEL XT", Tungsten, -9, { 1.5589, 1, 1.9205, 0 } },
{ "Canon", "EOS DIGITAL REBEL XT", Tungsten, 0, { 1.5343, 1, 2.2880, 0 } },
{ "Canon", "EOS DIGITAL REBEL XT", Tungsten, 9, { 1.3145, 1, 2.6873, 0 } },
- { "Canon", "EOS DIGITAL REBEL XT", Fluorescent, -9, { 2.3124, 1, 1.6356, 0 }
},
- { "Canon", "EOS DIGITAL REBEL XT", Fluorescent, 0, { 1.9754, 1, 1.9303, 0 }
},
- { "Canon", "EOS DIGITAL REBEL XT", Fluorescent, 9, { 1.6657, 1, 2.3034, 0 }
},
+ { "Canon", "EOS DIGITAL REBEL XT", WhiteFluorescent, -9, { 2.3124, 1,
1.6356, 0 } },
+ { "Canon", "EOS DIGITAL REBEL XT", WhiteFluorescent, 0, { 1.9754, 1, 1.9303,
0 } },
+ { "Canon", "EOS DIGITAL REBEL XT", WhiteFluorescent, 9, { 1.6657, 1, 2.3034,
0 } },
{ "Canon", "EOS DIGITAL REBEL XT", Flash, -9, { 3.0904, 1, 1.0756, 0
} },
{ "Canon", "EOS DIGITAL REBEL XT", Flash, 0, { 2.6729, 1, 1.2613, 0 } },
{ "Canon", "EOS DIGITAL REBEL XT", Flash, 9, { 2.3026, 1, 1.4961, 0 } },
@@ -1384,9 +1384,9 @@
{ "Canon", "EOS Kiss Digital N", Tungsten, -9, { 1.5589, 1, 1.9205, 0 } },
{ "Canon", "EOS Kiss Digital N", Tungsten, 0, { 1.5343, 1, 2.2880, 0
} },
{ "Canon", "EOS Kiss Digital N", Tungsten, 9, { 1.3145, 1, 2.6873, 0
} },
- { "Canon", "EOS Kiss Digital N", Fluorescent, -9, { 2.3124, 1, 1.6356, 0 } },
- { "Canon", "EOS Kiss Digital N", Fluorescent, 0, { 1.9754, 1, 1.9303, 0 } },
- { "Canon", "EOS Kiss Digital N", Fluorescent, 9, { 1.6657, 1, 2.3034, 0 } },
+ { "Canon", "EOS Kiss Digital N", WhiteFluorescent, -9, { 2.3124, 1, 1.6356,
0 } },
+ { "Canon", "EOS Kiss Digital N", WhiteFluorescent, 0, { 1.9754, 1, 1.9303, 0
} },
+ { "Canon", "EOS Kiss Digital N", WhiteFluorescent, 9, { 1.6657, 1, 2.3034, 0
} },
{ "Canon", "EOS Kiss Digital N", Flash, -9, { 3.0904, 1, 1.0756, 0 } },
{ "Canon", "EOS Kiss Digital N", Flash, 0, { 2.6729, 1, 1.2613, 0 } },
{ "Canon", "EOS Kiss Digital N", Flash, 9, { 2.3026, 1, 1.4961, 0 } },
@@ -1741,42 +1741,42 @@
{ "Canon", "EOS 450D", Shade, 0, { 2.566406, 1, 1.241211, 0 } },
{ "Canon", "EOS 450D", Cloudy, 0, { 2.386719, 1, 1.345703, 0 } },
{ "Canon", "EOS 450D", Tungsten, 0, { 1.559034, 1, 2.170841, 0 } },
- { "Canon", "EOS 450D", Fluorescent, 0, { 1.922857, 1, 1.996190, 0 } },
+ { "Canon", "EOS 450D", WhiteFluorescent, 0, { 1.922857, 1, 1.996190, 0 } },
{ "Canon", "EOS 450D", Flash, 0, { 2.456055, 1, 1.318359, 0 } },
{ "Canon", "EOS DIGITAL REBEL XSi", Daylight, 0, { 2.216797, 1, 1.471680, 0
} },
{ "Canon", "EOS DIGITAL REBEL XSi", Shade, 0, { 2.566406, 1, 1.241211, 0 } },
{ "Canon", "EOS DIGITAL REBEL XSi", Cloudy, 0, { 2.386719, 1, 1.345703, 0 }
},
{ "Canon", "EOS DIGITAL REBEL XSi", Tungsten, 0, { 1.559034, 1, 2.170841, 0
} },
- { "Canon", "EOS DIGITAL REBEL XSi", Fluorescent, 0, { 1.922857, 1, 1.996190,
0 } },
+ { "Canon", "EOS DIGITAL REBEL XSi", WhiteFluorescent, 0, { 1.922857, 1,
1.996190, 0 } },
{ "Canon", "EOS DIGITAL REBEL XSi", 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", WhiteFluorescent, 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 } },
{ "Canon", "EOS 500D", Cloudy, 0, { 2.156250, 1, 1.304687, 0 } },
{ "Canon", "EOS 500D", Tungsten, 0, { 1.481347, 1, 1.976342, 0 } },
- { "Canon", "EOS 500D", Fluorescent, 0, { 1.799224, 1, 1.824442, 0 } },
+ { "Canon", "EOS 500D", WhiteFluorescent, 0, { 1.799224, 1, 1.824442, 0 } },
{ "Canon", "EOS 500D", Flash, 0, { 2.207031, 1, 1.295898, 0 } },
{ "Canon", "EOS REBEL T1i", Daylight, 0, { 2.023438, 1, 1.417969, 0 } },
{ "Canon", "EOS REBEL T1i", Shade, 0, { 2.291016, 1,
1.217773, 0 } },
{ "Canon", "EOS REBEL T1i", Cloudy, 0, { 2.156250, 1, 1.304687, 0 } },
{ "Canon", "EOS REBEL T1i", Tungsten, 0, { 1.481347, 1, 1.976342, 0 } },
- { "Canon", "EOS REBEL T1i", Fluorescent, 0, { 1.799224, 1, 1.824442, 0 } },
+ { "Canon", "EOS REBEL T1i", WhiteFluorescent, 0, { 1.799224, 1, 1.824442, 0
} },
{ "Canon", "EOS REBEL T1i", 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", WhiteFluorescent, 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 */
@@ -2131,21 +2131,21 @@
{ "Canon", "EOS 600D", Shade, 0, { 2.592773, 1, 1.377930, 0 } },
{ "Canon", "EOS 600D", Cloudy, 0, { 2.409180, 1, 1.486328, 0 } },
{ "Canon", "EOS 600D", Tungsten, 0, { 1.597656, 1, 2.409180, 0 } },
- { "Canon", "EOS 600D", Fluorescent, 0, { 1.958008, 1, 2.260742, 0 } },
+ { "Canon", "EOS 600D", WhiteFluorescent, 0, { 1.958008, 1, 2.260742, 0 } },
{ "Canon", "EOS 600D", Flash, 0, { 2.509766, 1, 1.464844, 0 } },
{ "Canon", "EOS REBEL T3i", Daylight, 0, { 2.235352, 1, 1.612305, 0 } },
{ "Canon", "EOS REBEL T3i", Shade, 0, { 2.592773, 1,
1.377930, 0 } },
{ "Canon", "EOS REBEL T3i", Cloudy, 0, { 2.409180, 1, 1.486328, 0 } },
{ "Canon", "EOS REBEL T3i", Tungsten, 0, { 1.597656, 1, 2.409180, 0 } },
- { "Canon", "EOS REBEL T3i", Fluorescent, 0, { 1.958008, 1, 2.260742, 0 } },
+ { "Canon", "EOS REBEL T3i", WhiteFluorescent, 0, { 1.958008, 1, 2.260742, 0
} },
{ "Canon", "EOS REBEL T3i", 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", WhiteFluorescent, 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. */
@@ -2161,9 +2161,9 @@
{ "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", WhiteFluorescent, -3, { 1.6982, 1, 2.4268, 0 } },
+ { "Canon", "EOS 650D", WhiteFluorescent, 0, { 1.7715, 1, 2.3066, 0 } },
+ { "Canon", "EOS 650D", WhiteFluorescent, 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 } },
@@ -2180,9 +2180,9 @@
{ "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", WhiteFluorescent, -3, { 1.6982, 1, 2.4268, 0 } },
+ { "Canon", "EOS REBEL T4i", WhiteFluorescent, 0, { 1.7715, 1, 2.3066, 0 } },
+ { "Canon", "EOS REBEL T4i", WhiteFluorescent, 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
} },
@@ -2199,9 +2199,9 @@
{ "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", WhiteFluorescent, -3, { 1.6982, 1, 2.4268, 0 } },
+ { "Canon", "EOS Kiss X6i", WhiteFluorescent, 0, { 1.7715, 1, 2.3066, 0 } },
+ { "Canon", "EOS Kiss X6i", WhiteFluorescent, 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 } },
@@ -2211,21 +2211,21 @@
{ "Canon", "EOS 700D", Shade, 0, { 2.403320, 1, 1.302734, 0 } },
{ "Canon", "EOS 700D", Cloudy, 0, { 2.240234, 1, 1.412109, 0 } },
{ "Canon", "EOS 700D", Tungsten, 0, { 1.501953, 1, 2.365234, 0 } },
- { "Canon", "EOS 700D", Fluorescent, 0, { 1.832031, 1, 2.250977, 0 } },
+ { "Canon", "EOS 700D", WhiteFluorescent, 0, { 1.832031, 1, 2.250977, 0 } },
{ "Canon", "EOS 700D", Flash, 0, { 2.327148, 1, 1.398438, 0 } },
{ "Canon", "EOS REBEL T5i", Daylight, 0, { 2.089844, 1, 1.540039, 0 } },
{ "Canon", "EOS REBEL T5i", Shade, 0, { 2.403320, 1,
1.302734, 0 } },
{ "Canon", "EOS REBEL T5i", Cloudy, 0, { 2.240234, 1, 1.412109, 0 } },
{ "Canon", "EOS REBEL T5i", Tungsten, 0, { 1.501953, 1, 2.365234, 0 } },
- { "Canon", "EOS REBEL T5i", Fluorescent, 0, { 1.832031, 1, 2.250977, 0 } },
+ { "Canon", "EOS REBEL T5i", WhiteFluorescent, 0, { 1.832031, 1, 2.250977, 0
} },
{ "Canon", "EOS REBEL T5i", Flash, 0, { 2.327148, 1,
1.398438, 0 } },
{ "Canon", "EOS Kiss X7i", Daylight, 0, { 2.089844, 1, 1.540039, 0 } },
{ "Canon", "EOS Kiss X7i", Shade, 0, { 2.403320, 1, 1.302734, 0 } },
{ "Canon", "EOS Kiss X7i", Cloudy, 0, { 2.240234, 1,
1.412109, 0 } },
{ "Canon", "EOS Kiss X7i", Tungsten, 0, { 1.501953, 1, 2.365234, 0 } },
- { "Canon", "EOS Kiss X7i", Fluorescent, 0, { 1.832031, 1, 2.250977, 0 } },
+ { "Canon", "EOS Kiss X7i", WhiteFluorescent, 0, { 1.832031, 1, 2.250977, 0 }
},
{ "Canon", "EOS Kiss X7i", Flash, 0, { 2.327148, 1, 1.398438, 0 } },
{ "Canon", "EOS 750D", Daylight, 0, { 2.115234, 1, 1.701172, 0 } },
@@ -2277,21 +2277,21 @@
{ "Canon", "EOS 1000D", Shade, 0, { 2.553711, 1, 1.262695, 0 } },
{ "Canon", "EOS 1000D", Cloudy, 0, { 2.365234, 1, 1.375977, 0 } },
{ "Canon", "EOS 1000D", Tungsten, 0, { 1.470328, 1, 2.402126, 0 } },
- { "Canon", "EOS 1000D", Fluorescent, 0, { 1.889648, 1, 2.133789, 0 } },
+ { "Canon", "EOS 1000D", WhiteFluorescent, 0, { 1.889648, 1, 2.133789, 0 } },
{ "Canon", "EOS 1000D", Flash, 0, { 2.541830, 1, 1.769099, 0 } },
{ "Canon", "EOS DIGITAL REBEL XS", Daylight, 0, { 2.183594, 1, 1.526367, 0 }
},
{ "Canon", "EOS DIGITAL REBEL XS", Shade, 0, { 2.553711, 1, 1.262695, 0 } },
{ "Canon", "EOS DIGITAL REBEL XS", Cloudy, 0, { 2.365234, 1,
1.375977, 0 } },
{ "Canon", "EOS DIGITAL REBEL XS", Tungsten, 0, { 1.470328, 1, 2.402126, 0 }
},
- { "Canon", "EOS DIGITAL REBEL XS", Fluorescent, 0, { 1.889648, 1, 2.133789,
0 } },
+ { "Canon", "EOS DIGITAL REBEL XS", WhiteFluorescent, 0, { 1.889648, 1,
2.133789, 0 } },
{ "Canon", "EOS DIGITAL REBEL XS", Flash, 0, { 2.541830, 1, 1.769099, 0 } },
{ "Canon", "EOS Kiss Digital F", Daylight, 0, { 2.183594, 1,
1.526367, 0 } },
{ "Canon", "EOS Kiss Digital F", Shade, 0, { 2.553711, 1, 1.262695, 0 } },
{ "Canon", "EOS Kiss Digital F", Cloudy, 0, { 2.365234, 1, 1.375977, 0 } },
{ "Canon", "EOS Kiss Digital F", Tungsten, 0, { 1.470328, 1,
2.402126, 0 } },
- { "Canon", "EOS Kiss Digital F", Fluorescent, 0, { 1.889648, 1, 2.133789, 0
} },
+ { "Canon", "EOS Kiss Digital F", WhiteFluorescent, 0, { 1.889648, 1,
2.133789, 0 } },
{ "Canon", "EOS Kiss Digital F", Flash, 0, { 2.541830, 1, 1.769099, 0 } },
{ "Canon", "EOS 1100D", Daylight, 0, { 2.2559, 1, 1.4844, 0 } },
@@ -2361,7 +2361,7 @@
{ "Canon", "EOS-1DS", Shade, 0, { 1.8477, 1, 1.0684, 0 } }, /*
6685K */
{ "Canon", "EOS-1DS", Cloudy, 0, { 1.7285, 1, 1.1504, 0 } }, /*
5940K */
{ "Canon", "EOS-1DS", Tungsten, 0, { 1.1270, 1, 1.9199, 0 } }, /*
3334K */
- { "Canon", "EOS-1DS", Fluorescent, 0, { 1.2012, 1, 1.7168, 0
} }, /* 3643K */
+ { "Canon", "EOS-1DS", WhiteFluorescent, 0, { 1.2012, 1, 1.7168, 0 } }, /*
3643K */
{ "Canon", "EOS-1DS", Flash, 0, { 1.7793, 1, 1.1445, 0 } }, /*
6184K */
// Firmware Version 1.1.6
@@ -2369,20 +2369,20 @@
{ "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", WhiteFluorescent, 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 } },
- { "Canon", "EOS-1D Mark II", Fluorescent, 0, { 1.785853, 1, 1.785853, 0 } },
+ { "Canon", "EOS-1D Mark II", WhiteFluorescent, 0, { 1.785853, 1, 1.785853, 0
} },
{ "Canon", "EOS-1D Mark II", Shade, 0, { 2.220703, 1, 1.069336, 0 } },
{ "Canon", "EOS-1D Mark II", Tungsten, 0, { 1.415480, 1, 2.160142, 0 } },
{ "Canon", "EOS-1D Mark II N", Cloudy, 0, { 2.183594, 1, 1.220703, 0 } },
{ "Canon", "EOS-1D Mark II N", Daylight, 0, { 2.019531, 1, 1.349609, 0 } },
{ "Canon", "EOS-1D Mark II N", Flash, 0, { 2.291016, 1, 1.149414, 0 } },
- { "Canon", "EOS-1D Mark II N", Fluorescent, 0, { 1.802899, 1, 1.990338, 0 }
},
+ { "Canon", "EOS-1D Mark II N", WhiteFluorescent, 0, { 1.802899, 1, 1.990338,
0 } },
{ "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 } },
@@ -2390,14 +2390,14 @@
{ "Canon", "EOS-1D Mark III", Shade, 0, { 2.291016, 1, 1.205078, 0 } },
{ "Canon", "EOS-1D Mark III", Cloudy, 0, { 2.142578, 1, 1.325195, 0 } },
{ "Canon", "EOS-1D Mark III", Tungsten, 0, { 1.363470, 1, 2.380822, 0 } },
- { "Canon", "EOS-1D Mark III", Fluorescent, 0, { 1.742612, 1,
2.222116, 0 } },
+ { "Canon", "EOS-1D Mark III", WhiteFluorescent, 0, { 1.742612, 1, 2.222116,
0 } },
{ "Canon", "EOS-1D Mark III", Flash, 0, { 2.173828, 1, 1.288086, 0 } },
{ "Canon", "EOS-1Ds Mark III", Daylight, 0, { 2.093750, 1, 1.521484, 0 } },
{ "Canon", "EOS-1Ds Mark III", Shade, 0, { 2.420898, 1, 1.238281, 0 } },
{ "Canon", "EOS-1Ds Mark III", Cloudy, 0, { 2.250977, 1, 1.361328, 0 } },
{ "Canon", "EOS-1Ds Mark III", Tungsten, 0, { 1.455382, 1, 2.404784, 0 } },
- { "Canon", "EOS-1Ds Mark III", Fluorescent, 0, { 1.842718, 1, 2.330097, 0 }
},
+ { "Canon", "EOS-1Ds Mark III", WhiteFluorescent, 0, { 1.842718, 1, 2.330097,
0 } },
{ "Canon", "EOS-1Ds Mark III", Flash, 0, { 2.311523, 1, 1.316406, 0 } },
// Firmware Version 1.0.6 (Temporary)
@@ -2405,7 +2405,7 @@
{ "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", WhiteFluorescent, 0, { 1.767892, 1, 2.205029, 0
} },
{ "Canon", "EOS-1D Mark IV", Flash, 0, { 2.230469, 1, 1.423828, 0 } },
/* Canon EOS-1D X Firmware Version 1.0.6 */
@@ -2413,7 +2413,7 @@
{ "Canon", "EOS-1D X", Shade, 0, { 2.230469, 1, 1.175781, 0 } },
{ "Canon", "EOS-1D X", Cloudy, 0, { 2.085938, 1, 1.268555, 0 } },
{ "Canon", "EOS-1D X", Tungsten, 0, { 1.385742, 1, 2.068359, 0 } },
- { "Canon", "EOS-1D X", Fluorescent, 0, { 1.726563, 1, 1.950195, 0 } },
+ { "Canon", "EOS-1D X", WhiteFluorescent, 0, { 1.726563, 1, 1.950195, 0 } },
{ "Canon", "EOS-1D X", Flash, 0, { 2.173828, 1, 1.239258, 0 } },
{ "Canon", "EOS-1D X Mark II", Daylight, 0, { 1.822266, 1, 1.584961, 0 } },
@@ -2429,21 +2429,21 @@
{ "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 } },
+ { "Canon", "EOS M", WhiteFluorescent, 0, { 1.784180, 1, 2.275391, 0 } },
{ "Canon", "EOS M2", Cloudy, 0, { 2.085938, 1, 1.493164, 0 } },
{ "Canon", "EOS M2", Daylight, 0, { 1.943359, 1, 1.615234, 0 } },
{ "Canon", "EOS M2", Flash, 0, { 2.165039, 1, 1.475586, 0 } },
{ "Canon", "EOS M2", Tungsten, 0, { 1.391602, 1, 2.392578, 0 } },
{ "Canon", "EOS M2", Shade, 0, { 2.226563, 1, 1.381836, 0 } },
- { "Canon", "EOS M2", Fluorescent, 0, { 1.735352, 1, 2.280273, 0 } },
+ { "Canon", "EOS M2", WhiteFluorescent, 0, { 1.735352, 1, 2.280273, 0 } },
{ "Canon", "EOS M3", Cloudy, 0, { 2.316032, 1, 1.585928, 0 } },
{ "Canon", "EOS M3", Daylight, 0, { 2.140411, 1, 1.702055, 0 } },
{ "Canon", "EOS M3", Flash, 0, { 2.787515, 1, 1.357743, 0 } },
{ "Canon", "EOS M3", Tungsten, 0, { 1.488650, 1, 2.624851, 0 } },
{ "Canon", "EOS M3", Shade, 0, { 2.477855, 1, 1.488345, 0 } },
- { "Canon", "EOS M3", Fluorescent, 0, { 1.870460, 1, 2.325666, 0 } },
+ { "Canon", "EOS M3", WhiteFluorescent, 0, { 1.870460, 1, 2.325666, 0 } },
{ "Canon", "EOS M10", Cloudy, 0, { 2.171053, 1, 1.438596, 0 } },
{ "Canon", "EOS M10", Daylight, 0, { 1.992408, 1, 1.556399, 0 } },
------------------------------------------------------------------------------
_______________________________________________
ufraw-cvs mailing list
ufraw-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs
