Update of /cvsroot/ufraw/ufraw
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv30706
Modified Files:
wb_presets.c
Log Message:
Update WB presets and add fine tuning for the NIKON D5100. Stolen from
Darktable.
Index: wb_presets.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/wb_presets.c,v
retrieving revision 1.273
retrieving revision 1.274
diff -u -d -r1.273 -r1.274
--- wb_presets.c 30 Jan 2014 02:45:13 -0000 1.273
+++ wb_presets.c 31 Jan 2014 02:15:15 -0000 1.274
@@ -3709,18 +3709,162 @@
{ "NIKON", "D5000", DaylightFluorescent, 0, { 1.925781, 1, 1.074219, 0 } },
{ "NIKON", "D5000", HighTempMercuryVaporFluorescent, 0, { 2.207031, 1,
1.292969, 0 } },
- { "NIKON", "D5100", DirectSunlight, 0, { 2.0273, 1, 1.3906, 0 } },
- { "NIKON", "D5100", Flash, 0, { 2.2813, 1, 1.2109, 0
} },
- { "NIKON", "D5100", Cloudy, 0, { 2.1680, 1, 1.2656, 0 } },
- { "NIKON", "D5100", Shade, 0, { 2.4922, 1, 1.1367, 0
} },
- { "NIKON", "D5100", Incandescent, 0, { 1.3047, 1, 2.2148, 0 } },
- { "NIKON", "D5100", SodiumVaporFluorescent, 0, { 1.2031, 1, 2.4375, 0 } },
- { "NIKON", "D5100", WarmWhiteFluorescent, 0, { 1.3008, 1, 1.9648, 0 } },
- { "NIKON", "D5100", WhiteFluorescent, 0, { 1.4961, 1, 2.3047, 0 } },
- { "NIKON", "D5100", CoolWhiteFluorescent, 0, { 1.8320, 1, 2.0273, 0 } },
- { "NIKON", "D5100", DayWhiteFluorescent, 0, { 1.8984, 1, 1.3906, 0 } },
- { "NIKON", "D5100", DaylightFluorescent, 0, { 2.1680, 1, 1.1172, 0 } },
- { "NIKON", "D5100", HighTempMercuryVaporFluorescent, 0, { 2.4844, 1, 1.3672,
0 } },
+ { "NIKON", "D5100", DirectSunlight, -6, { 2.199219, 1, 1.242188, 0 } },
+ { "NIKON", "D5100", DirectSunlight, -5, { 2.167969, 1, 1.265625, 0 } },
+ { "NIKON", "D5100", DirectSunlight, -4, { 2.140625, 1, 1.285156, 0 } },
+ { "NIKON", "D5100", DirectSunlight, -3, { 2.117188, 1, 1.308594, 0 } },
+ { "NIKON", "D5100", DirectSunlight, -2, { 2.085938, 1, 1.335938, 0 } },
+ { "NIKON", "D5100", DirectSunlight, -1, { 2.058594, 1, 1.363281, 0 } },
+ { "NIKON", "D5100", DirectSunlight, 0, { 2.027344, 1, 1.390625, 0 } },
+ { "NIKON", "D5100", DirectSunlight, 1, { 2.000000, 1, 1.421875, 0 } },
+ { "NIKON", "D5100", DirectSunlight, 2, { 1.972656, 1, 1.449219, 0 } },
+ { "NIKON", "D5100", DirectSunlight, 3, { 1.941406, 1, 1.472656, 0 } },
+ { "NIKON", "D5100", DirectSunlight, 4, { 1.910156, 1, 1.500000, 0 } },
+ { "NIKON", "D5100", DirectSunlight, 5, { 1.882813, 1, 1.523438, 0 } },
+ { "NIKON", "D5100", DirectSunlight, 6, { 1.847656, 1, 1.542969, 0 } },
+ { "NIKON", "D5100", Flash, -6, { 2.511719, 1, 1.132813, 0 } },
+ { "NIKON", "D5100", Flash, -5, { 2.460938, 1, 1.144531, 0 } },
+ { "NIKON", "D5100", Flash, -4, { 2.414063, 1, 1.160156, 0 } },
+ { "NIKON", "D5100", Flash, -3, { 2.375000, 1, 1.171875, 0 } },
+ { "NIKON", "D5100", Flash, -2, { 2.339844, 1, 1.183594, 0 } },
+ { "NIKON", "D5100", Flash, -1, { 2.308594, 1, 1.199219, 0 } },
+ { "NIKON", "D5100", Flash, 0, { 2.281250, 1,
1.210938, 0 } },
+ { "NIKON", "D5100", Flash, 1, { 2.250000, 1,
1.226563, 0 } },
+ { "NIKON", "D5100", Flash, 2, { 2.222656, 1,
1.238281, 0 } },
+ { "NIKON", "D5100", Flash, 3, { 2.191406, 1,
1.253906, 0 } },
+ { "NIKON", "D5100", Flash, 4, { 2.160156, 1,
1.273438, 0 } },
+ { "NIKON", "D5100", Flash, 5, { 2.125000, 1,
1.289063, 0 } },
+ { "NIKON", "D5100", Flash, 6, { 2.089844, 1,
1.308594, 0 } },
+ { "NIKON", "D5100", Cloudy, -6, { 2.386719, 1, 1.164063, 0 } },
+ { "NIKON", "D5100", Cloudy, -5, { 2.343750, 1, 1.175781, 0 } },
+ { "NIKON", "D5100", Cloudy, -4, { 2.300781, 1, 1.195313, 0 } },
+ { "NIKON", "D5100", Cloudy, -3, { 2.261719, 1, 1.210938, 0 } },
+ { "NIKON", "D5100", Cloudy, -2, { 2.230469, 1, 1.226563, 0 } },
+ { "NIKON", "D5100", Cloudy, -1, { 2.199219, 1, 1.242188, 0 } },
+ { "NIKON", "D5100", Cloudy, 0, { 2.167969, 1, 1.265625, 0 } },
+ { "NIKON", "D5100", Cloudy, 1, { 2.140625, 1, 1.285156, 0 } },
+ { "NIKON", "D5100", Cloudy, 2, { 2.117188, 1, 1.308594, 0 } },
+ { "NIKON", "D5100", Cloudy, 3, { 2.085938, 1, 1.335938, 0 } },
+ { "NIKON", "D5100", Cloudy, 4, { 2.058594, 1, 1.363281, 0 } },
+ { "NIKON", "D5100", Cloudy, 5, { 2.027344, 1, 1.390625, 0 } },
+ { "NIKON", "D5100", Cloudy, 6, { 2.000000, 1, 1.421875, 0 } },
+ { "NIKON", "D5100", Shade, -6, { 2.828125, 1, 1.023438, 0 } },
+ { "NIKON", "D5100", Shade, -5, { 2.769531, 1, 1.050781, 0 } },
+ { "NIKON", "D5100", Shade, -4, { 2.703125, 1, 1.074219, 0 } },
+ { "NIKON", "D5100", Shade, -3, { 2.644531, 1, 1.093750, 0 } },
+ { "NIKON", "D5100", Shade, -2, { 2.585938, 1, 1.109375, 0 } },
+ { "NIKON", "D5100", Shade, -1, { 2.539063, 1, 1.121094, 0 } },
+ { "NIKON", "D5100", Shade, 0, { 2.492188, 1,
1.136719, 0 } },
+ { "NIKON", "D5100", Shade, 1, { 2.445313, 1,
1.148438, 0 } },
+ { "NIKON", "D5100", Shade, 2, { 2.406250, 1,
1.156250, 0 } },
+ { "NIKON", "D5100", Shade, 3, { 2.359375, 1,
1.171875, 0 } },
+ { "NIKON", "D5100", Shade, 4, { 2.316406, 1,
1.187500, 0 } },
+ { "NIKON", "D5100", Shade, 5, { 2.277344, 1,
1.203125, 0 } },
+ { "NIKON", "D5100", Shade, 6, { 2.246094, 1,
1.218750, 0 } },
+ { "NIKON", "D5100", Incandescent, -6, { 1.417969, 1,
2.003906, 0 } },
+ { "NIKON", "D5100", Incandescent, -5, { 1.394531, 1,
2.035156, 0 } },
+ { "NIKON", "D5100", Incandescent, -4, { 1.375000, 1,
2.066406, 0 } },
+ { "NIKON", "D5100", Incandescent, -3, { 1.355469, 1,
2.101563, 0 } },
+ { "NIKON", "D5100", Incandescent, -2, { 1.339844, 1,
2.140625, 0 } },
+ { "NIKON", "D5100", Incandescent, -1, { 1.324219, 1,
2.179688, 0 } },
+ { "NIKON", "D5100", Incandescent, 0, { 1.304688, 1, 2.214844, 0 } },
+ { "NIKON", "D5100", Incandescent, 1, { 1.289063, 1, 2.257813, 0 } },
+ { "NIKON", "D5100", Incandescent, 2, { 1.273438, 1, 2.296875, 0 } },
+ { "NIKON", "D5100", Incandescent, 3, { 1.261719, 1, 2.335938, 0 } },
+ { "NIKON", "D5100", Incandescent, 4, { 1.246094, 1, 2.378906, 0 } },
+ { "NIKON", "D5100", Incandescent, 5, { 1.230469, 1, 2.421875, 0 } },
+ { "NIKON", "D5100", Incandescent, 6, { 1.218750, 1, 2.464844, 0 } },
+ { "NIKON", "D5100", SodiumVaporFluorescent, -6, { 1.324219, 1, 2.187500, 0 }
},
+ { "NIKON", "D5100", SodiumVaporFluorescent, -5, { 1.296875, 1, 2.230469, 0 }
},
+ { "NIKON", "D5100", SodiumVaporFluorescent, -4, { 1.273438, 1, 2.277344, 0 }
},
+ { "NIKON", "D5100", SodiumVaporFluorescent, -3, { 1.253906, 1, 2.316406, 0 }
},
+ { "NIKON", "D5100", SodiumVaporFluorescent, -2, { 1.238281, 1, 2.355469, 0 }
},
+ { "NIKON", "D5100", SodiumVaporFluorescent, -1, { 1.218750, 1, 2.398438, 0 }
},
+ { "NIKON", "D5100", SodiumVaporFluorescent, 0, { 1.203125, 1, 2.437500, 0 }
},
+ { "NIKON", "D5100", SodiumVaporFluorescent, 1, { 1.187500, 1, 2.480469, 0 }
},
+ { "NIKON", "D5100", SodiumVaporFluorescent, 2, { 1.175781, 1, 2.523438, 0 }
},
+ { "NIKON", "D5100", SodiumVaporFluorescent, 3, { 1.164063, 1, 2.566406, 0 }
},
+ { "NIKON", "D5100", SodiumVaporFluorescent, 4, { 1.152344, 1, 2.609375, 0 }
},
+ { "NIKON", "D5100", SodiumVaporFluorescent, 5, { 1.140625, 1, 2.664063, 0 }
},
+ { "NIKON", "D5100", SodiumVaporFluorescent, 6, { 1.128906, 1, 2.718750, 0 }
},
+ { "NIKON", "D5100", WarmWhiteFluorescent, -6, { 1.414063, 1,
1.859375, 0 } },
+ { "NIKON", "D5100", WarmWhiteFluorescent, -5, { 1.394531, 1,
1.878906, 0 } },
+ { "NIKON", "D5100", WarmWhiteFluorescent, -4, { 1.375000, 1,
1.894531, 0 } },
+ { "NIKON", "D5100", WarmWhiteFluorescent, -3, { 1.355469, 1,
1.914063, 0 } },
+ { "NIKON", "D5100", WarmWhiteFluorescent, -2, { 1.335938, 1,
1.929688, 0 } },
+ { "NIKON", "D5100", WarmWhiteFluorescent, -1, { 1.316406, 1,
1.949219, 0 } },
+ { "NIKON", "D5100", WarmWhiteFluorescent, 0, { 1.300781, 1, 1.964844, 0 } },
+ { "NIKON", "D5100", WarmWhiteFluorescent, 1, { 1.281250, 1, 1.984375, 0 } },
+ { "NIKON", "D5100", WarmWhiteFluorescent, 2, { 1.261719, 1, 2.003906, 0 } },
+ { "NIKON", "D5100", WarmWhiteFluorescent, 3, { 1.246094, 1, 2.023438, 0 } },
+ { "NIKON", "D5100", WarmWhiteFluorescent, 4, { 1.230469, 1, 2.042969, 0 } },
+ { "NIKON", "D5100", WarmWhiteFluorescent, 5, { 1.214844, 1, 2.062500, 0 } },
+ { "NIKON", "D5100", WarmWhiteFluorescent, 6, { 1.199219, 1, 2.082031, 0 } },
+ { "NIKON", "D5100", WhiteFluorescent, -6, { 1.812500, 1, 2.042969, 0 } },
+ { "NIKON", "D5100", WhiteFluorescent, -5, { 1.765625, 1, 2.085938, 0 } },
+ { "NIKON", "D5100", WhiteFluorescent, -4, { 1.714844, 1, 2.128906, 0 } },
+ { "NIKON", "D5100", WhiteFluorescent, -3, { 1.664063, 1, 2.171875, 0 } },
+ { "NIKON", "D5100", WhiteFluorescent, -2, { 1.609375, 1, 2.214844, 0 } },
+ { "NIKON", "D5100", WhiteFluorescent, -1, { 1.550781, 1, 2.261719, 0 } },
+ { "NIKON", "D5100", WhiteFluorescent, 0, { 1.496094, 1, 2.304688, 0 } },
+ { "NIKON", "D5100", WhiteFluorescent, 1, { 1.429688, 1, 2.355469, 0 } },
+ { "NIKON", "D5100", WhiteFluorescent, 2, { 1.363281, 1, 2.406250, 0 } },
+ { "NIKON", "D5100", WhiteFluorescent, 3, { 1.296875, 1, 2.460938, 0 } },
+ { "NIKON", "D5100", WhiteFluorescent, 4, { 1.226563, 1, 2.515625, 0 } },
+ { "NIKON", "D5100", WhiteFluorescent, 5, { 1.156250, 1, 2.570313, 0 } },
+ { "NIKON", "D5100", WhiteFluorescent, 6, { 1.078125, 1, 2.628906, 0 } },
+ { "NIKON", "D5100", CoolWhiteFluorescent, -6, { 2.105469, 1,
1.808594, 0 } },
+ { "NIKON", "D5100", CoolWhiteFluorescent, -5, { 2.062500, 1,
1.843750, 0 } },
+ { "NIKON", "D5100", CoolWhiteFluorescent, -4, { 2.019531, 1,
1.878906, 0 } },
+ { "NIKON", "D5100", CoolWhiteFluorescent, -3, { 1.976563, 1,
1.917969, 0 } },
+ { "NIKON", "D5100", CoolWhiteFluorescent, -2, { 1.933594, 1,
1.953125, 0 } },
+ { "NIKON", "D5100", CoolWhiteFluorescent, -1, { 1.882813, 1,
1.988281, 0 } },
+ { "NIKON", "D5100", CoolWhiteFluorescent, 0, { 1.832031, 1, 2.027344, 0 } },
+ { "NIKON", "D5100", CoolWhiteFluorescent, 1, { 1.789063, 1, 2.070313, 0 } },
+ { "NIKON", "D5100", CoolWhiteFluorescent, 2, { 1.738281, 1, 2.109375, 0 } },
+ { "NIKON", "D5100", CoolWhiteFluorescent, 3, { 1.687500, 1, 2.152344, 0 } },
+ { "NIKON", "D5100", CoolWhiteFluorescent, 4, { 1.632813, 1, 2.195313, 0 } },
+ { "NIKON", "D5100", CoolWhiteFluorescent, 5, { 1.574219, 1, 2.238281, 0 } },
+ { "NIKON", "D5100", CoolWhiteFluorescent, 6, { 1.519531, 1, 2.281250, 0 } },
+ { "NIKON", "D5100", DayWhiteFluorescent, -6, { 2.070313, 1, 1.214844, 0 } },
+ { "NIKON", "D5100", DayWhiteFluorescent, -5, { 2.042969, 1, 1.246094, 0 } },
+ { "NIKON", "D5100", DayWhiteFluorescent, -4, { 2.011719, 1, 1.277344, 0 } },
+ { "NIKON", "D5100", DayWhiteFluorescent, -3, { 1.984375, 1, 1.304688, 0 } },
+ { "NIKON", "D5100", DayWhiteFluorescent, -2, { 1.953125, 1, 1.332031, 0 } },
+ { "NIKON", "D5100", DayWhiteFluorescent, -1, { 1.925781, 1, 1.363281, 0 } },
+ { "NIKON", "D5100", DayWhiteFluorescent, 0, { 1.898438, 1, 1.390625, 0 } },
+ { "NIKON", "D5100", DayWhiteFluorescent, 1, { 1.871094, 1, 1.417969, 0 } },
+ { "NIKON", "D5100", DayWhiteFluorescent, 2, { 1.843750, 1, 1.441406, 0 } },
+ { "NIKON", "D5100", DayWhiteFluorescent, 3, { 1.816406, 1, 1.472656, 0 } },
+ { "NIKON", "D5100", DayWhiteFluorescent, 4, { 1.792969, 1, 1.496094, 0 } },
+ { "NIKON", "D5100", DayWhiteFluorescent, 5, { 1.765625, 1, 1.523438, 0 } },
+ { "NIKON", "D5100", DayWhiteFluorescent, 6, { 1.742188, 1, 1.546875, 0 } },
+ { "NIKON", "D5100", DaylightFluorescent, -6, { 2.359375, 1, 1.000000, 0 } },
+ { "NIKON", "D5100", DaylightFluorescent, -5, { 2.328125, 1, 1.000000, 0 } },
+ { "NIKON", "D5100", DaylightFluorescent, -4, { 2.296875, 1, 1.000000, 0 } },
+ { "NIKON", "D5100", DaylightFluorescent, -3, { 2.261719, 1, 1.015625, 0 } },
+ { "NIKON", "D5100", DaylightFluorescent, -2, { 2.230469, 1, 1.050781, 0 } },
+ { "NIKON", "D5100", DaylightFluorescent, -1, { 2.199219, 1, 1.082031, 0 } },
+ { "NIKON", "D5100", DaylightFluorescent, 0, { 2.167969, 1, 1.117188, 0 } },
+ { "NIKON", "D5100", DaylightFluorescent, 1, { 2.136719, 1, 1.148438, 0 } },
+ { "NIKON", "D5100", DaylightFluorescent, 2, { 2.109375, 1, 1.179688, 0 } },
+ { "NIKON", "D5100", DaylightFluorescent, 3, { 2.078125, 1, 1.210938, 0 } },
+ { "NIKON", "D5100", DaylightFluorescent, 4, { 2.046875, 1, 1.242188, 0 } },
+ { "NIKON", "D5100", DaylightFluorescent, 5, { 2.019531, 1, 1.269531, 0 } },
+ { "NIKON", "D5100", DaylightFluorescent, 6, { 1.988281, 1, 1.300781, 0 } },
+ { "NIKON", "D5100", HighTempMercuryVaporFluorescent, -6, { 2.578125, 1,
1.222656, 0 } },
+ { "NIKON", "D5100", HighTempMercuryVaporFluorescent, -5, { 2.566406, 1,
1.246094, 0 } },
+ { "NIKON", "D5100", HighTempMercuryVaporFluorescent, -4, { 2.550781, 1,
1.265625, 0 } },
+ { "NIKON", "D5100", HighTempMercuryVaporFluorescent, -3, { 2.535156, 1,
1.292969, 0 } },
+ { "NIKON", "D5100", HighTempMercuryVaporFluorescent, -2, { 2.519531, 1,
1.316406, 0 } },
+ { "NIKON", "D5100", HighTempMercuryVaporFluorescent, -1, { 2.503906, 1,
1.343750, 0 } },
+ { "NIKON", "D5100", HighTempMercuryVaporFluorescent, 0, { 2.484375, 1,
1.367188, 0 } },
+ { "NIKON", "D5100", HighTempMercuryVaporFluorescent, 1, { 2.464844, 1,
1.394531, 0 } },
+ { "NIKON", "D5100", HighTempMercuryVaporFluorescent, 2, { 2.441406, 1,
1.421875, 0 } },
+ { "NIKON", "D5100", HighTempMercuryVaporFluorescent, 3, { 2.425781, 1,
1.453125, 0 } },
+ { "NIKON", "D5100", HighTempMercuryVaporFluorescent, 4, { 2.402344, 1,
1.476563, 0 } },
+ { "NIKON", "D5100", HighTempMercuryVaporFluorescent, 5, { 2.375000, 1,
1.511719, 0 } },
+ { "NIKON", "D5100", HighTempMercuryVaporFluorescent, 6, { 2.375000, 1,
1.511719, 0 } },
{ "NIKON", "D5300", DirectSunlight, 0, { 2.054688, 1, 1.394531, 0 } },
{ "NIKON", "D5300", Flash, 0, { 2.289063, 1,
1.230469, 0 } },
------------------------------------------------------------------------------
WatchGuard Dimension instantly turns raw network data into actionable
security intelligence. It gives you real-time visual feedback on key
security issues and trends. Skip the complicated setup - simply import
a virtual appliance and go from zero to informed in seconds.
http://pubads.g.doubleclick.net/gampad/clk?id=123612991&iu=/4140/ostg.clktrk
_______________________________________________
ufraw-cvs mailing list
ufraw-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs
