Update of /cvsroot/ufraw/ufraw
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv13075
Modified Files:
wb_presets.c
Log Message:
Add WB presets and fine-tuning for the Canon PowerShot G7 X. Stolen from
Darktable.
Index: wb_presets.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/wb_presets.c,v
retrieving revision 1.330
retrieving revision 1.331
diff -u -d -r1.330 -r1.331
--- wb_presets.c 13 Aug 2015 23:45:10 -0000 1.330
+++ wb_presets.c 20 Aug 2015 16:00:11 -0000 1.331
@@ -119,6 +119,160 @@
{ "Canon", "PowerShot G6", FluorescentHigh, 0, { 2.543677, 1, 1.650587, 0 }
},
{ "Canon", "PowerShot G6", Flash, 0, { 2.285322, 1, 1.333333, 0 } },
+ /* Canon PowerShot G7 X Firmware Version 1.0.0 */
+ { "Canon", "PowerShot G7 X", Daylight, -9, { 1.783160, 1, 2.119954, 0 } },
+ { "Canon", "PowerShot G7 X", Daylight, -8, { 1.808266, 1, 2.072331, 0 } },
+ { "Canon", "PowerShot G7 X", Daylight, -7, { 1.836197, 1, 2.028637, 0 } },
+ { "Canon", "PowerShot G7 X", Daylight, -6, { 1.865143, 1, 1.986286, 0 } },
+ { "Canon", "PowerShot G7 X", Daylight, -5, { 1.901938, 1, 1.930445, 0 } },
+ { "Canon", "PowerShot G7 X", Daylight, -4, { 1.939773, 1, 1.878409, 0 } },
+ { "Canon", "PowerShot G7 X", Daylight, -3, { 1.984091, 1, 1.831818, 0 } },
+ { "Canon", "PowerShot G7 X", Daylight, -2, { 2.037500, 1, 1.780682, 0 } },
+ { "Canon", "PowerShot G7 X", Daylight, -1, { 2.087699, 1, 1.739180, 0 } },
+ { "Canon", "PowerShot G7 X", Daylight, 0, { 2.125285, 1, 1.703872, 0 } },
+ { "Canon", "PowerShot G7 X", Daylight, 1, { 2.170091, 1, 1.670091, 0 } },
+ { "Canon", "PowerShot G7 X", Daylight, 2, { 2.213227, 1, 1.624857, 0 } },
+ { "Canon", "PowerShot G7 X", Daylight, 3, { 2.262857, 1, 1.584000, 0 } },
+ { "Canon", "PowerShot G7 X", Daylight, 4, { 2.306286, 1, 1.544000, 0 } },
+ { "Canon", "PowerShot G7 X", Daylight, 5, { 2.375000, 1, 1.494266, 0 } },
+ { "Canon", "PowerShot G7 X", Daylight, 6, { 2.454441, 1, 1.445213, 0 } },
+ { "Canon", "PowerShot G7 X", Daylight, 7, { 2.538636, 1, 1.396591, 0 } },
+ { "Canon", "PowerShot G7 X", Daylight, 8, { 2.644444, 1, 1.340351, 0 } },
+ { "Canon", "PowerShot G7 X", Daylight, 9, { 2.788849, 1, 1.282325, 0 } },
+ { "Canon", "PowerShot G7 X", Shade, -9, { 1.964813, 1, 1.847900, 0 } },
+ { "Canon", "PowerShot G7 X", Shade, -8, { 2.010216, 1, 1.800227, 0 } },
+ { "Canon", "PowerShot G7 X", Shade, -7, { 2.062429, 1, 1.748014, 0 } },
+ { "Canon", "PowerShot G7 X", Shade, -6, { 2.109339, 1, 1.716401, 0 } },
+ { "Canon", "PowerShot G7 X", Shade, -5, { 2.144647, 1, 1.685649, 0 } },
+ { "Canon", "PowerShot G7 X", Shade, -4, { 2.191562, 1, 1.644242, 0 } },
+ { "Canon", "PowerShot G7 X", Shade, -3, { 2.238041, 1, 1.600228, 0 } },
+ { "Canon", "PowerShot G7 X", Shade, -2, { 2.284247, 1, 1.559361, 0 } },
+ { "Canon", "PowerShot G7 X", Shade, -1, { 2.342497, 1, 1.517755, 0 } },
+ { "Canon", "PowerShot G7 X", Shade, 0, { 2.413318, 1, 1.463835, 0 } },
+ { "Canon", "PowerShot G7 X", Shade, 1, { 2.494226, 1, 1.414550, 0 } },
+ { "Canon", "PowerShot G7 X", Shade, 2, { 2.588372, 1, 1.363953, 0 } },
+ { "Canon", "PowerShot G7 X", Shade, 3, { 2.720000, 1, 1.302353, 0 } },
+ { "Canon", "PowerShot G7 X", Shade, 4, { 2.874402, 1, 1.247608, 0 } },
+ { "Canon", "PowerShot G7 X", Shade, 5, { 3.064792, 1, 1.189487, 0 } },
+ { "Canon", "PowerShot G7 X", Shade, 6, { 3.337121, 1, 1.126263, 0 } },
+ { "Canon", "PowerShot G7 X", Shade, 7, { 3.668421, 1, 1.068421, 0 } },
+ { "Canon", "PowerShot G7 X", Shade, 8, { 4.072022, 1, 1.015235, 0 } },
+ { "Canon", "PowerShot G7 X", Shade, 9, { 4.596750, 1, 0.964549, 0 } },
+ { "Canon", "PowerShot G7 X", Cloudy, -9, { 1.872872, 1, 1.937571, 0 } },
+ { "Canon", "PowerShot G7 X", Cloudy, -8, { 1.918275, 1, 1.892168, 0 } },
+ { "Canon", "PowerShot G7 X", Cloudy, -7, { 1.958050, 1, 1.843537, 0 } },
+ { "Canon", "PowerShot G7 X", Cloudy, -6, { 2.002265, 1, 1.792752, 0 } },
+ { "Canon", "PowerShot G7 X", Cloudy, -5, { 2.058957, 1, 1.746032, 0 } },
+ { "Canon", "PowerShot G7 X", Cloudy, -4, { 2.097616, 1, 1.709421, 0 } },
+ { "Canon", "PowerShot G7 X", Cloudy, -3, { 2.133939, 1, 1.675369, 0 } },
+ { "Canon", "PowerShot G7 X", Cloudy, -2, { 2.186788, 1, 1.640091, 0 } },
+ { "Canon", "PowerShot G7 X", Cloudy, -1, { 2.230068, 1, 1.595672, 0 } },
+ { "Canon", "PowerShot G7 X", Cloudy, 0, { 2.278221, 1, 1.553022, 0 } },
+ { "Canon", "PowerShot G7 X", Cloudy, 1, { 2.327252, 1, 1.508552, 0 } },
+ { "Canon", "PowerShot G7 X", Cloudy, 2, { 2.403207, 1, 1.460481, 0 } },
+ { "Canon", "PowerShot G7 X", Cloudy, 3, { 2.485023, 1, 1.411290, 0 } },
+ { "Canon", "PowerShot G7 X", Cloudy, 4, { 2.575406, 1, 1.359629, 0 } },
+ { "Canon", "PowerShot G7 X", Cloudy, 5, { 2.707746, 1, 1.299296, 0 } },
+ { "Canon", "PowerShot G7 X", Cloudy, 6, { 2.860382, 1, 1.244630, 0 } },
+ { "Canon", "PowerShot G7 X", Cloudy, 7, { 3.046285, 1, 1.187576, 0 } },
+ { "Canon", "PowerShot G7 X", Cloudy, 8, { 3.316981, 1, 1.122013, 0 } },
+ { "Canon", "PowerShot G7 X", Cloudy, 9, { 3.644823, 1, 1.064220, 0 } },
+ { "Canon", "PowerShot G7 X", Tungsten, -9, { 1.257614, 1, 3.238579, 0 } },
+ { "Canon", "PowerShot G7 X", Tungsten, -8, { 1.277778, 1, 3.184343, 0 } },
+ { "Canon", "PowerShot G7 X", Tungsten, -7, { 1.301887, 1, 3.138365, 0 } },
+ { "Canon", "PowerShot G7 X", Tungsten, -6, { 1.323714, 1, 3.094103, 0 } },
+ { "Canon", "PowerShot G7 X", Tungsten, -5, { 1.344569, 1, 3.047441, 0 } },
+ { "Canon", "PowerShot G7 X", Tungsten, -4, { 1.368486, 1, 2.980149, 0 } },
+ { "Canon", "PowerShot G7 X", Tungsten, -3, { 1.389163, 1, 2.913793, 0 } },
+ { "Canon", "PowerShot G7 X", Tungsten, -2, { 1.415441, 1, 2.857843, 0 } },
+ { "Canon", "PowerShot G7 X", Tungsten, -1, { 1.437424, 1, 2.780073, 0 } },
+ { "Canon", "PowerShot G7 X", Tungsten, 0, { 1.466102, 1, 2.727603, 0 } },
+ { "Canon", "PowerShot G7 X", Tungsten, 1, { 1.492788, 1, 2.658654, 0 } },
+ { "Canon", "PowerShot G7 X", Tungsten, 2, { 1.523353, 1, 2.605988, 0 } },
+ { "Canon", "PowerShot G7 X", Tungsten, 3, { 1.546539, 1, 2.562053, 0 } },
+ { "Canon", "PowerShot G7 X", Tungsten, 4, { 1.570749, 1, 2.516052, 0 } },
+ { "Canon", "PowerShot G7 X", Tungsten, 5, { 1.601423, 1, 2.469751, 0 } },
+ { "Canon", "PowerShot G7 X", Tungsten, 6, { 1.629586, 1, 2.427219, 0 } },
+ { "Canon", "PowerShot G7 X", Tungsten, 7, { 1.659198, 1, 2.378538, 0 } },
+ { "Canon", "PowerShot G7 X", Tungsten, 8, { 1.676023, 1, 2.311111, 0 } },
+ { "Canon", "PowerShot G7 X", Tungsten, 9, { 1.709790, 1, 2.251748, 0 } },
+ { "Canon", "PowerShot G7 X", Fluorescent, -9, { 1.784211, 1,
2.950000, 0 } },
+ { "Canon", "PowerShot G7 X", Fluorescent, -8, { 1.817824, 1,
2.891219, 0 } },
+ { "Canon", "PowerShot G7 X", Fluorescent, -7, { 1.851175, 1,
2.828982, 0 } },
+ { "Canon", "PowerShot G7 X", Fluorescent, -6, { 1.883117, 1,
2.762338, 0 } },
+ { "Canon", "PowerShot G7 X", Fluorescent, -5, { 1.916129, 1,
2.686452, 0 } },
+ { "Canon", "PowerShot G7 X", Fluorescent, -4, { 1.948718, 1,
2.611538, 0 } },
+ { "Canon", "PowerShot G7 X", Fluorescent, -3, { 1.984713, 1,
2.536306, 0 } },
+ { "Canon", "PowerShot G7 X", Fluorescent, -2, { 2.017766, 1,
2.475888, 0 } },
+ { "Canon", "PowerShot G7 X", Fluorescent, -1, { 2.049242, 1,
2.411616, 0 } },
+ { "Canon", "PowerShot G7 X", Fluorescent, 0, { 2.083019, 1, 2.355975, 0 } },
+ { "Canon", "PowerShot G7 X", Fluorescent, 1, { 2.116688, 1, 2.303639, 0 } },
+ { "Canon", "PowerShot G7 X", Fluorescent, 2, { 2.158750, 1, 2.241250, 0 } },
+ { "Canon", "PowerShot G7 X", Fluorescent, 3, { 2.212235, 1, 2.179775, 0 } },
+ { "Canon", "PowerShot G7 X", Fluorescent, 4, { 2.265918, 1, 2.122347, 0 } },
+ { "Canon", "PowerShot G7 X", Fluorescent, 5, { 2.324594, 1, 2.063670, 0 } },
+ { "Canon", "PowerShot G7 X", Fluorescent, 6, { 2.384040, 1, 1.997506, 0 } },
+ { "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", 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 } },
+ { "Canon", "PowerShot G7 X", Flash, -6, { 2.181818, 1, 1.637500, 0 } },
+ { "Canon", "PowerShot G7 X", Flash, -5, { 2.233485, 1, 1.596811, 0 } },
+ { "Canon", "PowerShot G7 X", Flash, -4, { 2.281642, 1, 1.557583, 0 } },
+ { "Canon", "PowerShot G7 X", Flash, -3, { 2.337143, 1, 1.514286, 0 } },
+ { "Canon", "PowerShot G7 X", Flash, -2, { 2.405963, 1, 1.462156, 0 } },
+ { "Canon", "PowerShot G7 X", Flash, -1, { 2.489043, 1, 1.414072, 0 } },
+ { "Canon", "PowerShot G7 X", Flash, 0, { 2.585366, 1, 1.361208, 0 } },
+ { "Canon", "PowerShot G7 X", Flash, 1, { 2.710928, 1, 1.301998, 0 } },
+ { "Canon", "PowerShot G7 X", Flash, 2, { 2.869773, 1, 1.244922, 0 } },
+ { "Canon", "PowerShot G7 X", Flash, 3, { 3.054878, 1, 1.185366, 0 } },
+ { "Canon", "PowerShot G7 X", Flash, 4, { 3.318239, 1, 1.122013, 0 } },
+ { "Canon", "PowerShot G7 X", Flash, 5, { 3.649606, 1, 1.066929, 0 } },
+ { "Canon", "PowerShot G7 X", Flash, 6, { 4.066390, 1, 1.013831, 0 } },
+ { "Canon", "PowerShot G7 X", Flash, 7, { 4.593796, 1, 0.964549, 0 } },
+ { "Canon", "PowerShot G7 X", Flash, 8, { 5.258786, 1, 0.918530, 0 } },
+ { "Canon", "PowerShot G7 X", Flash, 9, { 6.229537, 1, 0.875445, 0 } },
+ { "Canon", "PowerShot G7 X", Underwater, -9, { 1.826772, 1, 2.085489, 0 } },
+ { "Canon", "PowerShot G7 X", Underwater, -8, { 1.858889, 1, 2.036667, 0 } },
+ { "Canon", "PowerShot G7 X", Underwater, -7, { 1.890258, 1, 1.995521, 0 } },
+ { "Canon", "PowerShot G7 X", Underwater, -6, { 1.937984, 1, 1.937984, 0 } },
+ { "Canon", "PowerShot G7 X", Underwater, -5, { 1.979911, 1, 1.888393, 0 } },
+ { "Canon", "PowerShot G7 X", Underwater, -4, { 2.030963, 1, 1.837156, 0 } },
+ { "Canon", "PowerShot G7 X", Underwater, -3, { 2.079365, 1, 1.783447, 0 } },
+ { "Canon", "PowerShot G7 X", Underwater, -2, { 2.114317, 1, 1.744728, 0 } },
+ { "Canon", "PowerShot G7 X", Underwater, -1, { 2.151025, 1, 1.714132, 0 } },
+ { "Canon", "PowerShot G7 X", Underwater, 0, { 2.202198, 1, 1.675824, 0 } },
+ { "Canon", "PowerShot G7 X", Underwater, 1, { 2.261521, 1, 1.632488, 0 } },
+ { "Canon", "PowerShot G7 X", Underwater, 2, { 2.308370, 1, 1.591410, 0 } },
+ { "Canon", "PowerShot G7 X", Underwater, 3, { 2.361392, 1, 1.551066, 0 } },
+ { "Canon", "PowerShot G7 X", Underwater, 4, { 2.437355, 1, 1.497680, 0 } },
+ { "Canon", "PowerShot G7 X", Underwater, 5, { 2.508869, 1, 1.444568, 0 } },
+ { "Canon", "PowerShot G7 X", Underwater, 6, { 2.603859, 1, 1.398411, 0 } },
+ { "Canon", "PowerShot G7 X", Underwater, 7, { 2.734624, 1, 1.337130, 0 } },
+ { "Canon", "PowerShot G7 X", Underwater, 8, { 2.882016, 1, 1.278351, 0 } },
+ { "Canon", "PowerShot G7 X", Underwater, 9, { 3.025362, 1, 1.225845, 0 } },
+
{ "Canon", "PowerShot G9", Daylight, 0, { 2.089552, 1, 1.786452, 0 } },
{ "Canon", "PowerShot G9", Cloudy, 0, { 2.208716, 1,
1.660550, 0 } },
{ "Canon", "PowerShot G9", Tungsten, 0, { 1.533493, 1, 2.586124, 0 } },
------------------------------------------------------------------------------
_______________________________________________
ufraw-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs
