Update of /cvsroot/ufraw/ufraw
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv17434
Modified Files:
wb_presets.c
Log Message:
Add WB presets for the NIKON D810. Stolen from Darktable. Adjust WB presets for
the NIKON D800 and D800E.
Index: wb_presets.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/wb_presets.c,v
retrieving revision 1.285
retrieving revision 1.286
diff -u -d -r1.285 -r1.286
--- wb_presets.c 16 Oct 2014 03:45:18 -0000 1.285
+++ wb_presets.c 22 Oct 2014 02:45:32 -0000 1.286
@@ -3416,47 +3416,55 @@
{ "NIKON", "D700", "9090K", 0, { 2.382812, 1, 1.035156, 0 } },
{ "NIKON", "D700", "10000K", 0, { 2.480469, 1, 1.000000, 0 } },
- { "NIKON", "D800", Incandescent, -6, { 1.39062500, 1, 1.98437500, 0
} },
- { "NIKON", "D800", Incandescent, 0, { 1.28906250, 1, 2.17578125, 0
} },
- { "NIKON", "D800", Incandescent, 6, { 1.19921875, 1, 2.42968750, 0
} },
- { "NIKON", "D800", CoolWhiteFluorescent, -6, { 2.00390625, 1, 1.76953125, 0
} },
- { "NIKON", "D800", CoolWhiteFluorescent, 0, { 1.76562500, 1, 2.00390625, 0
} },
- { "NIKON", "D800", CoolWhiteFluorescent, 6, { 1.48046875, 1, 2.25781250, 0
} },
- { "NIKON", "D800", DirectSunlight, -6, { 2.12890625, 1, 1.23046875, 0
} },
- { "NIKON", "D800", DirectSunlight, 0, { 1.97265625, 1,
1.37500000, 0 } },
- { "NIKON", "D800", DirectSunlight, 6, { 1.80468750, 1,
1.53125000, 0 } },
- { "NIKON", "D800", Flash, -6, { 2.39843750, 1,
1.12500000, 0 } },
- { "NIKON", "D800", Flash, 0, { 2.18750000, 1, 1.20703125, 0
} },
- { "NIKON", "D800", Flash, 6, { 2.02734375, 1, 1.30078125, 0
} },
- { "NIKON", "D800", Cloudy, -6, { 2.29296875, 1, 1.15625000, 0
} },
- { "NIKON", "D800", Cloudy, 0, { 2.10156250, 1,
1.25390625, 0 } },
- { "NIKON", "D800", Cloudy, 6, { 1.94531250, 1,
1.40234375, 0 } },
- { "NIKON", "D800", Shade, -6, { 2.68750000, 1,
1.01562500, 0 } },
- { "NIKON", "D800", Shade, 0, { 2.37890625, 1, 1.12890625, 0
} },
- { "NIKON", "D800", Shade, 6, { 2.16796875, 1, 1.20703125, 0
} },
- { "NIKON", "D800", "2700K", 0, { 1.17968750, 1, 2.48828125, 0
} },
- { "NIKON", "D800", "5000K", 0, { 1.92968750, 1, 1.41796875, 0
} },
+ { "NIKON", "D800", Incandescent, -6, { 1.390625, 1, 1.984375, 0 } },
+ { "NIKON", "D800", Incandescent, 0, { 1.289063, 1, 2.175781, 0 } },
+ { "NIKON", "D800", Incandescent, 6, { 1.199219, 1, 2.429688, 0 } },
+ { "NIKON", "D800", CoolWhiteFluorescent, -6, { 2.003906, 1, 1.769531, 0 } },
+ { "NIKON", "D800", CoolWhiteFluorescent, 0, { 1.765625, 1, 2.003906, 0 } },
+ { "NIKON", "D800", CoolWhiteFluorescent, 6, { 1.480469, 1, 2.257813, 0 } },
+ { "NIKON", "D800", DirectSunlight, -6, { 2.128906, 1, 1.230469, 0 } },
+ { "NIKON", "D800", DirectSunlight, 0, { 1.972656, 1,
1.375000, 0 } },
+ { "NIKON", "D800", DirectSunlight, 6, { 1.804688, 1,
1.531250, 0 } },
+ { "NIKON", "D800", Flash, -6, { 2.398438, 1,
1.125000, 0 } },
+ { "NIKON", "D800", Flash, 0, { 2.187500, 1, 1.207031, 0 } },
+ { "NIKON", "D800", Flash, 6, { 2.027344, 1, 1.300781, 0 } },
+ { "NIKON", "D800", Cloudy, -6, { 2.292969, 1, 1.156250, 0 } },
+ { "NIKON", "D800", Cloudy, 0, { 2.101563, 1,
1.253906, 0 } },
+ { "NIKON", "D800", Cloudy, 6, { 1.945313, 1,
1.402344, 0 } },
+ { "NIKON", "D800", Shade, -6, { 2.687500, 1,
1.015625, 0 } },
+ { "NIKON", "D800", Shade, 0, { 2.378906, 1, 1.128906, 0 } },
+ { "NIKON", "D800", Shade, 6, { 2.167969, 1, 1.207031, 0 } },
+ { "NIKON", "D800", "2700K", 0, { 1.179688, 1, 2.488281, 0 } },
+ { "NIKON", "D800", "5000K", 0, { 1.929688, 1, 1.417969, 0 } },
- { "NIKON", "D800E", Incandescent, -6, { 1.39062500, 1,
1.98437500, 0 } },
- { "NIKON", "D800E", Incandescent, 0, { 1.28906250, 1, 2.17578125, 0
} },
- { "NIKON", "D800E", Incandescent, 6, { 1.19921875, 1, 2.42968750, 0
} },
- { "NIKON", "D800E", CoolWhiteFluorescent, -6, { 2.00390625, 1,
1.76953125, 0 } },
- { "NIKON", "D800E", CoolWhiteFluorescent, 0, { 1.76562500, 1, 2.00390625, 0
} },
- { "NIKON", "D800E", CoolWhiteFluorescent, 6, { 1.48046875, 1, 2.25781250, 0
} },
- { "NIKON", "D800E", DirectSunlight, -6, { 2.12890625, 1, 1.23046875, 0
} },
- { "NIKON", "D800E", DirectSunlight, 0, { 1.97265625, 1, 1.37500000, 0
} },
- { "NIKON", "D800E", DirectSunlight, 6, { 1.80468750, 1, 1.53125000, 0
} },
- { "NIKON", "D800E", Flash, -6, { 2.39843750, 1, 1.12500000, 0
} },
- { "NIKON", "D800E", Flash, 0, { 2.18750000, 1,
1.20703125, 0 } },
- { "NIKON", "D800E", Flash, 6, { 2.02734375, 1,
1.30078125, 0 } },
- { "NIKON", "D800E", Cloudy, -6, { 2.29296875, 1, 1.15625000, 0
} },
- { "NIKON", "D800E", Cloudy, 0, { 2.10156250, 1, 1.25390625, 0
} },
- { "NIKON", "D800E", Cloudy, 6, { 1.94531250, 1, 1.40234375, 0
} },
- { "NIKON", "D800E", Shade, -6, { 2.68750000, 1, 1.01562500, 0
} },
- { "NIKON", "D800E", Shade, 0, { 2.37890625, 1,
1.12890625, 0 } },
- { "NIKON", "D800E", Shade, 6, { 2.16796875, 1,
1.20703125, 0 } },
- { "NIKON", "D800E", "2700K", 0, { 1.17968750, 1, 2.48828125, 0
} },
- { "NIKON", "D800E", "5000K", 0, { 1.92968750, 1, 1.41796875, 0
} },
+ { "NIKON", "D800E", Incandescent, -6, { 1.390625, 1,
1.984375, 0 } },
+ { "NIKON", "D800E", Incandescent, 0, { 1.289063, 1, 2.175781, 0 } },
+ { "NIKON", "D800E", Incandescent, 6, { 1.199219, 1, 2.429688, 0 } },
+ { "NIKON", "D800E", CoolWhiteFluorescent, -6, { 2.003906, 1,
1.769531, 0 } },
+ { "NIKON", "D800E", CoolWhiteFluorescent, 0, { 1.765625, 1, 2.003906, 0 } },
+ { "NIKON", "D800E", CoolWhiteFluorescent, 6, { 1.480469, 1, 2.257813, 0 } },
+ { "NIKON", "D800E", DirectSunlight, -6, { 2.128906, 1, 1.230469, 0 } },
+ { "NIKON", "D800E", DirectSunlight, 0, { 1.972656, 1, 1.375000, 0 } },
+ { "NIKON", "D800E", DirectSunlight, 6, { 1.804688, 1, 1.531250, 0 } },
+ { "NIKON", "D800E", Flash, -6, { 2.398438, 1, 1.125000, 0 } },
+ { "NIKON", "D800E", Flash, 0, { 2.187500, 1,
1.207031, 0 } },
+ { "NIKON", "D800E", Flash, 6, { 2.027344, 1,
1.300781, 0 } },
+ { "NIKON", "D800E", Cloudy, -6, { 2.292969, 1, 1.156250, 0 } },
+ { "NIKON", "D800E", Cloudy, 0, { 2.101563, 1, 1.253906, 0 } },
+ { "NIKON", "D800E", Cloudy, 6, { 1.945313, 1, 1.402344, 0 } },
+ { "NIKON", "D800E", Shade, -6, { 2.687500, 1, 1.015625, 0 } },
+ { "NIKON", "D800E", Shade, 0, { 2.378906, 1,
1.128906, 0 } },
+ { "NIKON", "D800E", Shade, 6, { 2.167969, 1,
1.207031, 0 } },
+ { "NIKON", "D800E", "2700K", 0, { 1.179688, 1, 2.488281, 0 } },
+ { "NIKON", "D800E", "5000K", 0, { 1.929688, 1, 1.417969, 0 } },
+
+ /* D810 with firmware C: 1.01 L: 2.005 */
+ { "NIKON", "D810", DirectSunlight, 0, { 1.953125, 1,
1.335938, 0 } },
+ { "NIKON", "D810", Flash, 0, { 2.183594, 1, 1.171875, 0 } },
+ { "NIKON", "D810", Cloudy, 0, { 2.089844, 1,
1.210938, 0 } },
+ { "NIKON", "D810", Shade, 0, { 2.410156, 1, 1.089844, 0 } },
+ { "NIKON", "D810", Incandescent, 0, { 1.253906, 1, 2.136719, 0 } },
+ { "NIKON", "D810", CoolWhiteFluorescent, 0, { 1.789063, 1, 1.968750, 0 } },
{ "NIKON", "D40", Incandescent, -3, { 1.492188, 1, 2.164063, 0 } },
{ "NIKON", "D40", Incandescent, -2, { 1.437500, 1, 2.367188, 0 } },
------------------------------------------------------------------------------
Comprehensive Server Monitoring with Site24x7.
Monitor 10 servers for $9/Month.
Get alerted through email, SMS, voice calls or mobile push notifications.
Take corrective actions from your mobile device.
http://p.sf.net/sfu/Zoho
_______________________________________________
ufraw-cvs mailing list
ufraw-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs
