Update of /cvsroot/ufraw/ufraw In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv17097
Modified Files: wb_presets.c Log Message: Add WB presets for the NIKON COOLPIX P340. Stolen from Darktable. Index: wb_presets.c =================================================================== RCS file: /cvsroot/ufraw/ufraw/wb_presets.c,v retrieving revision 1.318 retrieving revision 1.319 diff -u -d -r1.318 -r1.319 --- wb_presets.c 28 May 2015 19:00:11 -0000 1.318 +++ wb_presets.c 5 Jun 2015 02:30:14 -0000 1.319 @@ -2638,13 +2638,21 @@ { "NIKON", "1 V1", Shade, 0, { 2.257813, 1, 1.277344, 0 } }, // Nikon CoolPix P330 firmware 1.0 - { "NIKON", "COOLPIX P330", DirectSunlight, 0, { 1.792969, 1, 1.65625, 0 }}, - { "NIKON", "COOLPIX P330", Incandescent, 0, { 1.171875, 1, 2.730469, 0 }}, - { "NIKON", "COOLPIX P330", WhiteFluorescent, 0, { 1.867188, 1, 2.421875, 0 }}, - { "NIKON", "COOLPIX P330", DayWhiteFluorescent, 0, { 1.8125, 1, 1.742188, 0 }}, - { "NIKON", "COOLPIX P330", DaylightFluorescent, 0, { 2.046875, 1, 1.390625, 0}}, - { "NIKON", "COOLPIX P330", Cloudy, 0, { 1.929688, 1, 1.480469, 0 }}, - { "NIKON", "COOLPIX P330", Flash, 0, { 2.039063, 1, 1.578125, 0 }}, + { "NIKON", "COOLPIX P330", DirectSunlight, 0, { 1.792969, 1, 1.656250, 0 } }, + { "NIKON", "COOLPIX P330", Incandescent, 0, { 1.171875, 1, 2.730469, 0 } }, + { "NIKON", "COOLPIX P330", CoolWhiteFluorescent, 0, { 1.867188, 1, 2.421875, 0 } }, + { "NIKON", "COOLPIX P330", DayWhiteFluorescent, 0, { 1.812500, 1, 1.742188, 0 } }, + { "NIKON", "COOLPIX P330", DaylightFluorescent, 0, { 2.046875, 1, 1.390625, 0 } }, + { "NIKON", "COOLPIX P330", Cloudy, 0, { 1.929688, 1, 1.480469, 0 } }, + { "NIKON", "COOLPIX P330", Flash, 0, { 2.039063, 1, 1.578125, 0 } }, + + { "NIKON", "COOLPIX P340", DirectSunlight, 0, { 1.835938, 1, 1.632813, 0 } }, + { "NIKON", "COOLPIX P340", Incandescent, 0, { 1.199219, 1, 2.691406, 0 } }, + { "NIKON", "COOLPIX P340", CoolWhiteFluorescent, 0, { 1.914063, 1, 2.386719, 0 } }, + { "NIKON", "COOLPIX P340", DayWhiteFluorescent, 0, { 1.855469, 1, 1.718750, 0 } }, + { "NIKON", "COOLPIX P340", DaylightFluorescent, 0, { 2.093750, 1, 1.371094, 0 } }, + { "NIKON", "COOLPIX P340", Cloudy, 0, { 1.976563, 1, 1.457031, 0 } }, + { "NIKON", "COOLPIX P340", Flash, 0, { 2.085938, 1, 1.554688, 0 } }, // Fine tuning is from A6 to B6 on amber-blue. { "NIKON", "COOLPIX P7100", DirectSunlight, -6, { 1.7908, 1, 1.9042, 0 } }, @@ -2653,9 +2661,9 @@ { "NIKON", "COOLPIX P7100", Incandescent, -6, { 1.2708, 1, 3.0068, 0 } }, { "NIKON", "COOLPIX P7100", Incandescent, 0, { 1.1730, 1, 3.3705, 0 } }, { "NIKON", "COOLPIX P7100", Incandescent, 6, { 1.0753, 1, 3.7693, 0 } }, - { "NIKON", "COOLPIX P7100", WhiteFluorescent, -6, { 2.0020, 1, 2.6158, 0 } }, - { "NIKON", "COOLPIX P7100", WhiteFluorescent, 0, { 1.8456, 1, 2.9326, 0 } }, - { "NIKON", "COOLPIX P7100", WhiteFluorescent, 6, { 1.6970, 1, 3.2805, 0 } }, + { "NIKON", "COOLPIX P7100", CoolWhiteFluorescent, -6, { 2.0020, 1, 2.6158, 0 } }, + { "NIKON", "COOLPIX P7100", CoolWhiteFluorescent, 0, { 1.8456, 1, 2.9326, 0 } }, + { "NIKON", "COOLPIX P7100", CoolWhiteFluorescent, 6, { 1.6970, 1, 3.2805, 0 } }, { "NIKON", "COOLPIX P7100", DayWhiteFluorescent, -6, { 1.9707, 1, 1.9003, 0 } }, { "NIKON", "COOLPIX P7100", DayWhiteFluorescent, 0, { 1.8182, 1, 2.1310, 0 } }, { "NIKON", "COOLPIX P7100", DayWhiteFluorescent, 6, { 1.6696, 1, 2.3812, 0 } }, ------------------------------------------------------------------------------ _______________________________________________ ufraw-cvs mailing list ufraw-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/ufraw-cvs