Update of /cvsroot/ufraw/ufraw
In directory vz-cvs-3.sog:/tmp/cvs-serv30117
Modified Files:
wb_presets.c
Log Message:
Update WB presets for the SONY NEX-7 and add WB presets for the SONY DSC-RX100.
Patches by Kevin Buettner.
Index: wb_presets.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/wb_presets.c,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -d -r1.224 -r1.225
--- wb_presets.c 29 Oct 2012 11:00:40 -0000 1.224
+++ wb_presets.c 4 Nov 2012 03:15:38 -0000 1.225
@@ -1768,6 +1768,13 @@
{ "MINOLTA", "DYNAX 7D", "9800K", 0, { 2.226562, 1, 1.144531, 0 } },
{ "MINOLTA", "DYNAX 7D", "9900K", 0, { 2.242188, 1, 1.144531, 0 } },
+ { "NIKON", "1 V1", Incandescent, 0, { 1.210938, 1, 2.308594, 0 } },
+ { "NIKON", "1 V1", CoolWhiteFluorescent, 0, { 1.687500, 1, 2.199219, 0 } },
+ { "NIKON", "1 V1", DirectSunlight, 0, { 1.828125, 1,
1.550781, 0 } },
+ { "NIKON", "1 V1", Flash, 0, { 2.101563, 1, 1.335938, 0 } },
+ { "NIKON", "1 V1", Cloudy, 0, { 1.960938, 1,
1.406250, 0 } },
+ { "NIKON", "1 V1", Shade, 0, { 2.257813, 1, 1.277344, 0 } },
+
// Fine tuning is from A6 to B6 on amber-blue.
{ "NIKON", "COOLPIX P7100", DirectSunlight, -6, { 1.7908, 1, 1.9042, 0 } },
{ "NIKON", "COOLPIX P7100", DirectSunlight, 0, { 1.6500, 1, 2.1349, 0 } },
@@ -1791,13 +1798,6 @@
{ "NIKON", "COOLPIX P7100", Flash, 0, { 2.1349, 1, 1.6579, 0
} },
{ "NIKON", "COOLPIX P7100", Flash, 6, { 1.9629, 1, 1.8534, 0
} },
- { "NIKON", "1 V1", Incandescent, 0, { 1.210938, 1, 2.308594, 0 } },
- { "NIKON", "1 V1", CoolWhiteFluorescent, 0, { 1.687500, 1, 2.199219, 0 } },
- { "NIKON", "1 V1", DirectSunlight, 0, { 1.828125, 1,
1.550781, 0 } },
- { "NIKON", "1 V1", Flash, 0, { 2.101563, 1, 1.335938, 0 } },
- { "NIKON", "1 V1", Cloudy, 0, { 1.960938, 1,
1.406250, 0 } },
- { "NIKON", "1 V1", Shade, 0, { 2.257813, 1, 1.277344, 0 } },
-
{ "NIKON", "D1", Incandescent, -3, { 1, 1.439891, 2.125769, 0 } },
{ "NIKON", "D1", Incandescent, 0, { 1, 1.582583, 2.556096, 0 } },
{ "NIKON", "D1", Incandescent, 3, { 1, 1.745033, 3.044175, 0 } },
@@ -4677,6 +4677,16 @@
{ "SAMSUNG", "NX200", Tungsten, 0, { 1.511719, 1, 2.941406, 0 } },
{ "SAMSUNG", "NX200", Flash, 0, { 2.914063, 1, 1.191406, 0 } },
+ { "SONY", "DSC-RX100", Daylight, 0, { 2.0703, 1, 2.1602, 0 } },
+ { "SONY", "DSC-RX100", Shade, 0, { 2.4531, 1, 1.7852, 0 } },
+ { "SONY", "DSC-RX100", Cloudy, 0, { 2.2305, 1, 1.9844, 0 } },
+ { "SONY", "DSC-RX100", Tungsten, 0, { 1.2891, 1, 3.8242, 0 } },
+ { "SONY", "DSC-RX100", WarmWhiteFluorescent, 0, { 1.5156, 1, 3.7656, 0 } },
+ { "SONY", "DSC-RX100", CoolWhiteFluorescent, 0, { 2.0430, 1, 3.1055, 0 } },
+ { "SONY", "DSC-RX100", DayWhiteFluorescent, 0, { 2.0000, 1, 2.1602, 0 } },
+ { "SONY", "DSC-RX100", DaylightFluorescent, 0, { 2.2266, 1, 1.8789, 0 } },
+ { "SONY", "DSC-RX100", Flash, 0, { 2.5352, 1, 1.6797, 0 } },
+
{ "SONY", "DSLR-A100", Daylight, -3, { 1.601562, 1, 2.101562, 0 } },
{ "SONY", "DSLR-A100", Daylight, 0, { 1.746094, 1, 1.843750, 0 } },
{ "SONY", "DSLR-A100", Daylight, 3, { 1.914062, 1, 1.628906, 0 } },
@@ -5011,15 +5021,15 @@
{ "SONY", "NEX-5", Flash, 2, { 2.9883, 1, 1.1289, 0 } },
{ "SONY", "NEX-5", Flash, 3, { 3.0742, 1, 1.0938, 0 } },
- { "SONY", "NEX-7", Daylight, 0, { 2.695313, 1, 1.425781, 0 } },
- { "SONY", "NEX-7", Shade, 0, { 3.214844, 1, 1.1875, 0 } },
- { "SONY", "NEX-7", Cloudy, 0, { 2.914063, 1,
1.316406, 0 } },
- { "SONY", "NEX-7", Tungsten, 0, { 1.660156, 1, 2.445313, 0 } },
- { "SONY", "NEX-7", Fluorescent, -1, { 1.902344, 1, 2.402344, 0 } },
- { "SONY", "NEX-7", Fluorescent, 0, { 2.421875, 1, 1.957031, 0 } },
- { "SONY", "NEX-7", Fluorescent, 1, { 2.566406, 1, 1.496094, 0 } },
- { "SONY", "NEX-7", Fluorescent, 2, { 2.894531, 1, 1.332031, 0 } },
- { "SONY", "NEX-7", Flash, 0, { 3.050781, 1, 1.347656, 0 } },
+ { "SONY", "NEX-7", Daylight, 0, { 2.5820, 1, 1.5273, 0 } },
+ { "SONY", "NEX-7", Shade, 0, { 3.0781, 1, 1.2734, 0 } },
+ { "SONY", "NEX-7", Cloudy, 0, { 2.7930, 1, 1.4102, 0
} },
+ { "SONY", "NEX-7", Tungsten, 0, { 1.5859, 1, 2.6133, 0 } },
+ { "SONY", "NEX-7", WarmWhiteFluorescent, 0, { 1.8203, 1, 2.5703, 0 } },
+ { "SONY", "NEX-7", CoolWhiteFluorescent, 0, { 2.3164, 1, 2.0937, 0 } },
+ { "SONY", "NEX-7", DayWhiteFluorescent, 0, { 2.4570, 1, 1.6055, 0 } },
+ { "SONY", "NEX-7", DaylightFluorescent, 0, { 2.7734, 1, 1.4258, 0 } },
+ { "SONY", "NEX-7", Flash, 0, { 2.9219, 1, 1.4453, 0 } },
{ "SONY", "SLT-A55V", Daylight, -3, { 2.3320, 1, 1.6758, 0 } },
{ "SONY", "SLT-A55V", Daylight, -2, { 2.3984, 1, 1.6172, 0 } },
------------------------------------------------------------------------------
LogMeIn Central: Instant, anywhere, Remote PC access and management.
Stay in control, update software, and manage PCs from one command center
Diagnose problems and improve visibility into emerging IT issues
Automate, monitor and manage. Do more in less time with Central
http://p.sf.net/sfu/logmein12331_d2d
_______________________________________________
ufraw-cvs mailing list
ufraw-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs
