Update of /cvsroot/ufraw/ufraw
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv3271
Modified Files:
wb_presets.c
Log Message:
Add WB presets for the Canon EOS 5D Mark IV and the PENTAX K-70. Update WB
presets for the NIKON D7100. Stolen from Darktable.
Index: wb_presets.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/wb_presets.c,v
retrieving revision 1.361
retrieving revision 1.362
diff -u -d -r1.361 -r1.362
--- wb_presets.c 9 Sep 2016 17:00:07 -0000 1.361
+++ wb_presets.c 4 Nov 2016 05:00:07 -0000 1.362
@@ -728,6 +728,13 @@
{ "Canon", "EOS 5D Mark III", Flash, 8, { 2.509766, 1, 1.297852, 0 } },
{ "Canon", "EOS 5D Mark III", Flash, 9, { 2.541016, 1, 1.278320, 0 } },
+ { "Canon", "EOS 5D Mark IV", Daylight, 0, { 1.976563, 1, 1.434570, 0 } },
+ { "Canon", "EOS 5D Mark IV", Shade, 0, { 2.260742, 1, 1.243164, 0 } },
+ { "Canon", "EOS 5D Mark IV", Cloudy, 0, { 2.115234, 1, 1.333008, 0 } },
+ { "Canon", "EOS 5D Mark IV", Tungsten, 0, { 1.416016, 1, 2.019531, 0 } },
+ { "Canon", "EOS 5D Mark IV", WhiteFluorescent, 0, { 1.672852, 1, 1.946289, 0
} },
+ { "Canon", "EOS 5D Mark IV", Flash, 0, { 2.165039, 1, 1.330078, 0 } },
+
{ "Canon", "EOS 5DS", Daylight, 0, { 2.255859, 1, 1.717773, 0 } },
{ "Canon", "EOS 5DS", Shade, 0, { 2.605469, 1, 1.484375, 0 } },
{ "Canon", "EOS 5DS", Cloudy, 0, { 2.438477, 1, 1.589844, 0 } },
@@ -4786,18 +4793,163 @@
{ "NIKON", "D7000", HighTempMercuryVaporFluorescent, 0, { 2.484375, 1,
1.367188, 0 } },
{ "NIKON", "D7000", HighTempMercuryVaporFluorescent, 6, { 2.351563, 1,
1.539063, 0 } },
+ /* NIKON D7100 / Firmware C 1.03 / L 2.008 */
+ { "NIKON", "D7100", DirectSunlight, -6, { 2.675781, 1, 1.425781, 0 } },
+ { "NIKON", "D7100", DirectSunlight, -5, { 2.628906, 1, 1.449219, 0 } },
+ { "NIKON", "D7100", DirectSunlight, -4, { 2.582031, 1, 1.476563, 0 } },
+ { "NIKON", "D7100", DirectSunlight, -3, { 2.535156, 1, 1.503906, 0 } },
+ { "NIKON", "D7100", DirectSunlight, -2, { 2.492188, 1, 1.535156, 0 } },
+ { "NIKON", "D7100", DirectSunlight, -1, { 2.441406, 1, 1.566406, 0 } },
{ "NIKON", "D7100", DirectSunlight, 0, { 2.386719, 1, 1.597656, 0 } },
+ { "NIKON", "D7100", DirectSunlight, 1, { 2.351563, 1, 1.632813, 0 } },
+ { "NIKON", "D7100", DirectSunlight, 2, { 2.312500, 1, 1.671875, 0 } },
+ { "NIKON", "D7100", DirectSunlight, 3, { 2.273438, 1, 1.703125, 0 } },
+ { "NIKON", "D7100", DirectSunlight, 4, { 2.230469, 1, 1.734375, 0 } },
+ { "NIKON", "D7100", DirectSunlight, 5, { 2.187500, 1, 1.761719, 0 } },
+ { "NIKON", "D7100", DirectSunlight, 6, { 2.144531, 1, 1.789063, 0 } },
+ { "NIKON", "D7100", Flash, -6, { 3.132813, 1, 1.281250, 0 } },
+ { "NIKON", "D7100", Flash, -5, { 3.050781, 1, 1.296875, 0 } },
+ { "NIKON", "D7100", Flash, -4, { 2.976563, 1, 1.312500, 0 } },
+ { "NIKON", "D7100", Flash, -3, { 2.914063, 1, 1.328125, 0 } },
+ { "NIKON", "D7100", Flash, -2, { 2.855469, 1, 1.343750, 0 } },
+ { "NIKON", "D7100", Flash, -1, { 2.800781, 1, 1.355469, 0 } },
{ "NIKON", "D7100", Flash, 0, { 2.753906, 1,
1.371094, 0 } },
+ { "NIKON", "D7100", Flash, 1, { 2.710938, 1,
1.386719, 0 } },
+ { "NIKON", "D7100", Flash, 2, { 2.671875, 1,
1.406250, 0 } },
+ { "NIKON", "D7100", Flash, 3, { 2.628906, 1,
1.425781, 0 } },
+ { "NIKON", "D7100", Flash, 4, { 2.585938, 1,
1.449219, 0 } },
+ { "NIKON", "D7100", Flash, 5, { 2.539063, 1,
1.472656, 0 } },
+ { "NIKON", "D7100", Flash, 6, { 2.488281, 1,
1.500000, 0 } },
+ { "NIKON", "D7100", Cloudy, -6, { 2.972656, 1, 1.328125, 0 } },
+ { "NIKON", "D7100", Cloudy, -5, { 2.902344, 1, 1.347656, 0 } },
+ { "NIKON", "D7100", Cloudy, -4, { 2.839844, 1, 1.363281, 0 } },
+ { "NIKON", "D7100", Cloudy, -3, { 2.781250, 1, 1.382813, 0 } },
+ { "NIKON", "D7100", Cloudy, -2, { 2.734375, 1, 1.402344, 0 } },
+ { "NIKON", "D7100", Cloudy, -1, { 2.695313, 1, 1.425781, 0 } },
{ "NIKON", "D7100", Cloudy, 0, { 2.656250, 1, 1.453125, 0 } },
+ { "NIKON", "D7100", Cloudy, 1, { 2.597656, 1, 1.476563, 0 } },
+ { "NIKON", "D7100", Cloudy, 2, { 2.542969, 1, 1.507813, 0 } },
+ { "NIKON", "D7100", Cloudy, 3, { 2.492188, 1, 1.535156, 0 } },
+ { "NIKON", "D7100", Cloudy, 4, { 2.445313, 1, 1.566406, 0 } },
+ { "NIKON", "D7100", Cloudy, 5, { 2.398438, 1, 1.601563, 0 } },
+ { "NIKON", "D7100", Cloudy, 6, { 2.351563, 1, 1.632813, 0 } },
+ { "NIKON", "D7100", Shade, -6, { 3.644531, 1, 1.148438, 0 } },
+ { "NIKON", "D7100", Shade, -5, { 3.554688, 1, 1.183594, 0 } },
+ { "NIKON", "D7100", Shade, -4, { 3.472656, 1, 1.214844, 0 } },
+ { "NIKON", "D7100", Shade, -3, { 3.386719, 1, 1.234375, 0 } },
+ { "NIKON", "D7100", Shade, -2, { 3.308594, 1, 1.257813, 0 } },
+ { "NIKON", "D7100", Shade, -1, { 3.242188, 1, 1.277344, 0 } },
{ "NIKON", "D7100", Shade, 0, { 3.183594, 1,
1.292969, 0 } },
+ { "NIKON", "D7100", Shade, 1, { 3.085938, 1,
1.308594, 0 } },
+ { "NIKON", "D7100", Shade, 2, { 2.992188, 1,
1.324219, 0 } },
+ { "NIKON", "D7100", Shade, 3, { 2.925781, 1,
1.339844, 0 } },
+ { "NIKON", "D7100", Shade, 4, { 2.859375, 1,
1.355469, 0 } },
+ { "NIKON", "D7100", Shade, 5, { 2.796875, 1,
1.371094, 0 } },
+ { "NIKON", "D7100", Shade, 6, { 2.746094, 1,
1.394531, 0 } },
+ { "NIKON", "D7100", Incandescent, -6, { 1.589844, 1,
2.371094, 0 } },
+ { "NIKON", "D7100", Incandescent, -5, { 1.562500, 1,
2.417969, 0 } },
+ { "NIKON", "D7100", Incandescent, -4, { 1.542969, 1,
2.468750, 0 } },
+ { "NIKON", "D7100", Incandescent, -3, { 1.519531, 1,
2.519531, 0 } },
+ { "NIKON", "D7100", Incandescent, -2, { 1.492188, 1,
2.566406, 0 } },
+ { "NIKON", "D7100", Incandescent, -1, { 1.468750, 1,
2.617188, 0 } },
{ "NIKON", "D7100", Incandescent, 0, { 1.445313, 1, 2.667969, 0 } },
+ { "NIKON", "D7100", Incandescent, 1, { 1.425781, 1, 2.718750, 0 } },
+ { "NIKON", "D7100", Incandescent, 2, { 1.410156, 1, 2.769531, 0 } },
+ { "NIKON", "D7100", Incandescent, 3, { 1.390625, 1, 2.820313, 0 } },
+ { "NIKON", "D7100", Incandescent, 4, { 1.371094, 1, 2.875000, 0 } },
+ { "NIKON", "D7100", Incandescent, 5, { 1.355469, 1, 2.925781, 0 } },
+ { "NIKON", "D7100", Incandescent, 6, { 1.335938, 1, 2.980469, 0 } },
+ { "NIKON", "D7100", SodiumVaporFluorescent, -6, { 1.488281, 1, 2.589844, 0 }
},
+ { "NIKON", "D7100", SodiumVaporFluorescent, -5, { 1.457031, 1, 2.644531, 0 }
},
+ { "NIKON", "D7100", SodiumVaporFluorescent, -4, { 1.425781, 1, 2.695313, 0 }
},
+ { "NIKON", "D7100", SodiumVaporFluorescent, -3, { 1.398438, 1, 2.746094, 0 }
},
+ { "NIKON", "D7100", SodiumVaporFluorescent, -2, { 1.375000, 1, 2.792969, 0 }
},
+ { "NIKON", "D7100", SodiumVaporFluorescent, -1, { 1.355469, 1, 2.847656, 0 }
},
{ "NIKON", "D7100", SodiumVaporFluorescent, 0, { 1.332031, 1, 2.894531, 0 }
},
+ { "NIKON", "D7100", SodiumVaporFluorescent, 1, { 1.312500, 1, 2.949219, 0 }
},
+ { "NIKON", "D7100", SodiumVaporFluorescent, 2, { 1.296875, 1, 3.000000, 0 }
},
+ { "NIKON", "D7100", SodiumVaporFluorescent, 3, { 1.281250, 1, 3.058594, 0 }
},
+ { "NIKON", "D7100", SodiumVaporFluorescent, 4, { 1.261719, 1, 3.113281, 0 }
},
+ { "NIKON", "D7100", SodiumVaporFluorescent, 5, { 1.250000, 1, 3.179688, 0 }
},
+ { "NIKON", "D7100", SodiumVaporFluorescent, 6, { 1.234375, 1, 3.246094, 0 }
},
+ { "NIKON", "D7100", WarmWhiteFluorescent, -6, { 1.621094, 1,
2.281250, 0 } },
+ { "NIKON", "D7100", WarmWhiteFluorescent, -5, { 1.597656, 1,
2.304688, 0 } },
+ { "NIKON", "D7100", WarmWhiteFluorescent, -4, { 1.574219, 1,
2.328125, 0 } },
+ { "NIKON", "D7100", WarmWhiteFluorescent, -3, { 1.546875, 1,
2.351563, 0 } },
+ { "NIKON", "D7100", WarmWhiteFluorescent, -2, { 1.527344, 1,
2.378906, 0 } },
+ { "NIKON", "D7100", WarmWhiteFluorescent, -1, { 1.500000, 1,
2.398438, 0 } },
{ "NIKON", "D7100", WarmWhiteFluorescent, 0, { 1.480469, 1, 2.425781, 0 } },
+ { "NIKON", "D7100", WarmWhiteFluorescent, 1, { 1.460938, 1, 2.449219, 0 } },
+ { "NIKON", "D7100", WarmWhiteFluorescent, 2, { 1.441406, 1, 2.476563, 0 } },
+ { "NIKON", "D7100", WarmWhiteFluorescent, 3, { 1.421875, 1, 2.500000, 0 } },
+ { "NIKON", "D7100", WarmWhiteFluorescent, 4, { 1.402344, 1, 2.523438, 0 } },
+ { "NIKON", "D7100", WarmWhiteFluorescent, 5, { 1.382813, 1, 2.546875, 0 } },
+ { "NIKON", "D7100", WarmWhiteFluorescent, 6, { 1.363281, 1, 2.570313, 0 } },
+ { "NIKON", "D7100", WhiteFluorescent, -6, { 2.199219, 1, 2.437500, 0 } },
+ { "NIKON", "D7100", WhiteFluorescent, -5, { 2.128906, 1, 2.492188, 0 } },
+ { "NIKON", "D7100", WhiteFluorescent, -4, { 2.054688, 1, 2.546875, 0 } },
+ { "NIKON", "D7100", WhiteFluorescent, -3, { 1.980469, 1, 2.605469, 0 } },
+ { "NIKON", "D7100", WhiteFluorescent, -2, { 1.902344, 1, 2.660156, 0 } },
+ { "NIKON", "D7100", WhiteFluorescent, -1, { 1.824219, 1, 2.718750, 0 } },
{ "NIKON", "D7100", WhiteFluorescent, 0, { 1.746094, 1, 2.777344, 0 } },
+ { "NIKON", "D7100", WhiteFluorescent, 1, { 1.671875, 1, 2.839844, 0 } },
+ { "NIKON", "D7100", WhiteFluorescent, 2, { 1.593750, 1, 2.902344, 0 } },
+ { "NIKON", "D7100", WhiteFluorescent, 3, { 1.515625, 1, 2.968750, 0 } },
+ { "NIKON", "D7100", WhiteFluorescent, 4, { 1.433594, 1, 3.031250, 0 } },
+ { "NIKON", "D7100", WhiteFluorescent, 5, { 1.347656, 1, 3.101563, 0 } },
+ { "NIKON", "D7100", WhiteFluorescent, 6, { 1.261719, 1, 3.167969, 0 } },
+ { "NIKON", "D7100", CoolWhiteFluorescent, -6, { 2.601563, 1,
2.136719, 0 } },
+ { "NIKON", "D7100", CoolWhiteFluorescent, -5, { 2.542969, 1,
2.179688, 0 } },
+ { "NIKON", "D7100", CoolWhiteFluorescent, -4, { 2.484375, 1,
2.226563, 0 } },
+ { "NIKON", "D7100", CoolWhiteFluorescent, -3, { 2.421875, 1,
2.273438, 0 } },
+ { "NIKON", "D7100", CoolWhiteFluorescent, -2, { 2.359375, 1,
2.320313, 0 } },
+ { "NIKON", "D7100", CoolWhiteFluorescent, -1, { 2.289063, 1,
2.367188, 0 } },
{ "NIKON", "D7100", CoolWhiteFluorescent, 0, { 2.222656, 1, 2.417969, 0 } },
+ { "NIKON", "D7100", CoolWhiteFluorescent, 1, { 2.156250, 1, 2.472656, 0 } },
+ { "NIKON", "D7100", CoolWhiteFluorescent, 2, { 2.082031, 1, 2.523438, 0 } },
+ { "NIKON", "D7100", CoolWhiteFluorescent, 3, { 2.007813, 1, 2.582031, 0 } },
+ { "NIKON", "D7100", CoolWhiteFluorescent, 4, { 1.933594, 1, 2.636719, 0 } },
+ { "NIKON", "D7100", CoolWhiteFluorescent, 5, { 1.851563, 1, 2.695313, 0 } },
+ { "NIKON", "D7100", CoolWhiteFluorescent, 6, { 1.773438, 1, 2.750000, 0 } },
+ { "NIKON", "D7100", DayWhiteFluorescent, -6, { 2.488281, 1, 1.433594, 0 } },
+ { "NIKON", "D7100", DayWhiteFluorescent, -5, { 2.445313, 1, 1.472656, 0 } },
+ { "NIKON", "D7100", DayWhiteFluorescent, -4, { 2.402344, 1, 1.507813, 0 } },
+ { "NIKON", "D7100", DayWhiteFluorescent, -3, { 2.363281, 1, 1.546875, 0 } },
+ { "NIKON", "D7100", DayWhiteFluorescent, -2, { 2.324219, 1, 1.582031, 0 } },
+ { "NIKON", "D7100", DayWhiteFluorescent, -1, { 2.285156, 1, 1.617188, 0 } },
{ "NIKON", "D7100", DayWhiteFluorescent, 0, { 2.242188, 1, 1.656250, 0 } },
+ { "NIKON", "D7100", DayWhiteFluorescent, 1, { 2.207031, 1, 1.691406, 0 } },
+ { "NIKON", "D7100", DayWhiteFluorescent, 2, { 2.175781, 1, 1.722656, 0 } },
+ { "NIKON", "D7100", DayWhiteFluorescent, 3, { 2.140625, 1, 1.757813, 0 } },
+ { "NIKON", "D7100", DayWhiteFluorescent, 4, { 2.105469, 1, 1.792969, 0 } },
+ { "NIKON", "D7100", DayWhiteFluorescent, 5, { 2.074219, 1, 1.824219, 0 } },
+ { "NIKON", "D7100", DayWhiteFluorescent, 6, { 2.039063, 1, 1.855469, 0 } },
+ { "NIKON", "D7100", DaylightFluorescent, -6, { 2.859375, 1, 1.062500, 0 } },
+ { "NIKON", "D7100", DaylightFluorescent, -5, { 2.820313, 1, 1.105469, 0 } },
+ { "NIKON", "D7100", DaylightFluorescent, -4, { 2.781250, 1, 1.144531, 0 } },
+ { "NIKON", "D7100", DaylightFluorescent, -3, { 2.742188, 1, 1.187500, 0 } },
+ { "NIKON", "D7100", DaylightFluorescent, -2, { 2.703125, 1, 1.226563, 0 } },
+ { "NIKON", "D7100", DaylightFluorescent, -1, { 2.664063, 1, 1.269531, 0 } },
{ "NIKON", "D7100", DaylightFluorescent, 0, { 2.628906, 1, 1.308594, 0 } },
+ { "NIKON", "D7100", DaylightFluorescent, 1, { 2.582031, 1, 1.347656, 0 } },
+ { "NIKON", "D7100", DaylightFluorescent, 2, { 2.539063, 1, 1.386719, 0 } },
+ { "NIKON", "D7100", DaylightFluorescent, 3, { 2.496094, 1, 1.425781, 0 } },
+ { "NIKON", "D7100", DaylightFluorescent, 4, { 2.453125, 1, 1.464844, 0 } },
+ { "NIKON", "D7100", DaylightFluorescent, 5, { 2.410156, 1, 1.500000, 0 } },
+ { "NIKON", "D7100", DaylightFluorescent, 6, { 2.367188, 1, 1.539063, 0 } },
+ { "NIKON", "D7100", HighTempMercuryVaporFluorescent, -6, { 3.312500, 1,
1.417969, 0 } },
+ { "NIKON", "D7100", HighTempMercuryVaporFluorescent, -5, { 3.296875, 1,
1.441406, 0 } },
+ { "NIKON", "D7100", HighTempMercuryVaporFluorescent, -4, { 3.277344, 1,
1.468750, 0 } },
+ { "NIKON", "D7100", HighTempMercuryVaporFluorescent, -3, { 3.257813, 1,
1.496094, 0 } },
+ { "NIKON", "D7100", HighTempMercuryVaporFluorescent, -2, { 3.234375, 1,
1.527344, 0 } },
+ { "NIKON", "D7100", HighTempMercuryVaporFluorescent, -1, { 3.214844, 1,
1.554688, 0 } },
{ "NIKON", "D7100", HighTempMercuryVaporFluorescent, 0, { 3.187500, 1,
1.585938, 0 } },
+ { "NIKON", "D7100", HighTempMercuryVaporFluorescent, 1, { 3.156250, 1,
1.617188, 0 } },
+ { "NIKON", "D7100", HighTempMercuryVaporFluorescent, 2, { 3.121094, 1,
1.652344, 0 } },
+ { "NIKON", "D7100", HighTempMercuryVaporFluorescent, 3, { 3.085938, 1,
1.687500, 0 } },
+ { "NIKON", "D7100", HighTempMercuryVaporFluorescent, 4, { 3.046875, 1,
1.722656, 0 } },
+ { "NIKON", "D7100", HighTempMercuryVaporFluorescent, 5, { 3.007813, 1,
1.761719, 0 } },
+ { "NIKON", "D7100", HighTempMercuryVaporFluorescent, 6, { 2.968750, 1,
1.796875, 0 } },
{ "NIKON", "D7100", "5000K", 0, { 2.332031, 1, 1.652344, 0 } },
// Firmware C 1.00 / L 2.008
@@ -7587,6 +7739,16 @@
{ "PENTAX", "K-50", Tungsten, 0, { 1.348755, 1, 2.894653, 0 } },
{ "PENTAX", "K-50", Flash, 0, { 2.544678, 1,
1.435913, 0 } },
+ /* PENTAX K-70 Firmware Version 1.10 */
+ { "PENTAX", "K-70", Daylight, 0, { 2.144531, 1, 1.707031, 0 } },
+ { "PENTAX", "K-70", Shade, 0, { 2.656250, 1,
1.250000, 0 } },
+ { "PENTAX", "K-70", Cloudy, 0, { 2.378906, 1, 1.464844, 0 } },
+ { "PENTAX", "K-70", Tungsten, 0, { 1.312500, 1, 2.976563, 0 } },
+ { "PENTAX", "K-70", WarmWhiteFluorescent, 0, { 1.699219, 1, 2.910156, 0 } },
+ { "PENTAX", "K-70", DayWhiteFluorescent, 0, { 2.230469, 1, 1.914063, 0 } },
+ { "PENTAX", "K-70", DaylightFluorescent, 0, { 2.628906, 1, 1.671875, 0 } },
+ { "PENTAX", "K-70", WhiteFluorescent, 0, { 2.019531, 1, 2.304688, 0 } },
+
/* PENTAX K-500 Firmware Version 1.00 */
{ "PENTAX", "K-500", Daylight, 0, { 2.207642, 1, 1.606079, 0 } },
{ "PENTAX", "K-500", Shade, 0, { 2.637695, 1, 1.198730, 0 } },
------------------------------------------------------------------------------
Developer Access Program for Intel Xeon Phi Processors
Access to Intel Xeon Phi processor-based developer platforms.
With one year of Intel Parallel Studio XE.
Training and support from Colfax.
Order your platform today. http://sdm.link/xeonphi
_______________________________________________
ufraw-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs
