Update of /cvsroot/ufraw/ufraw
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv26454
Modified Files:
wb_presets.c
Log Message:
Copy WB presets from the SAMSUNG NX200 to similar cameras. Add WB presets and
fine tuning for the SAMSUNG NX300. Stolen from Darktable.
Index: wb_presets.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/wb_presets.c,v
retrieving revision 1.277
retrieving revision 1.278
diff -u -d -r1.277 -r1.278
--- wb_presets.c 14 Apr 2014 05:30:14 -0000 1.277
+++ wb_presets.c 15 May 2014 03:30:23 -0000 1.278
@@ -6132,116 +6132,6 @@
{ "SAMSUNG", "GX10", Tungsten, 0, { 1.000000, 1, 2.558594, 0 } },
{ "SAMSUNG", "GX10", Flash, 0, { 1.664062, 1, 1.046875, 0 } },
- // SAMSUNG NX100 (firmware 1.12) white balance presets with finetuning steps
- { "SAMSUNG", "NX100", Daylight, -7, { 1.566333, 1, 1.526753, 0 } },
- { "SAMSUNG", "NX100", Daylight, -6, { 1.593941, 1, 1.475202, 0 } },
- { "SAMSUNG", "NX100", Daylight, -5, { 1.621793, 1, 1.423650, 0 } },
- { "SAMSUNG", "NX100", Daylight, -4, { 1.649401, 1, 1.371854, 0 } },
- { "SAMSUNG", "NX100", Daylight, -3, { 1.677010, 1, 1.320303, 0 } },
- { "SAMSUNG", "NX100", Daylight, -2, { 1.704618, 1, 1.268507, 0 } },
- { "SAMSUNG", "NX100", Daylight, -1, { 1.732470, 1, 1.216956, 0 } },
- { "SAMSUNG", "NX100", Daylight, 0, { 1.760078, 1, 1.165404, 0 } },
- { "SAMSUNG", "NX100", Daylight, 1, { 1.790129, 1, 1.137063, 0 } },
- { "SAMSUNG", "NX100", Daylight, 2, { 1.820425, 1, 1.108722, 0 } },
- { "SAMSUNG", "NX100", Daylight, 3, { 1.850721, 1, 1.080381, 0 } },
- { "SAMSUNG", "NX100", Daylight, 4, { 1.880772, 1, 1.052040, 0 } },
- { "SAMSUNG", "NX100", Daylight, 5, { 1.911068, 1, 1.023699, 0 } },
- { "SAMSUNG", "NX100", Daylight, 6, { 1.941377, 1, 0.995622, 0 } },
- { "SAMSUNG", "NX100", Daylight, 7, { 1.971874, 1, 0.967384, 0 } },
- { "SAMSUNG", "NX100", Cloudy, -7, { 1.638896, 1, 1.446372, 0 } },
- { "SAMSUNG", "NX100", Cloudy, -6, { 1.667725, 1, 1.397508, 0 } },
- { "SAMSUNG", "NX100", Cloudy, -5, { 1.696555, 1, 1.348644, 0 } },
- { "SAMSUNG", "NX100", Cloudy, -4, { 1.725629, 1, 1.299780, 0 } },
- { "SAMSUNG", "NX100", Cloudy, -3, { 1.754459, 1, 1.250672, 0 } },
- { "SAMSUNG", "NX100", Cloudy, -2, { 1.783533, 1, 1.201808, 0 } },
- { "SAMSUNG", "NX100", Cloudy, -1, { 1.812607, 1, 1.152944, 0 } },
- { "SAMSUNG", "NX100", Cloudy, 0, { 1.841437, 1, 1.103836, 0 } },
- { "SAMSUNG", "NX100", Cloudy, 1, { 1.872954, 1, 1.077205, 0 } },
- { "SAMSUNG", "NX100", Cloudy, 2, { 1.904471, 1, 1.050330, 0 } },
- { "SAMSUNG", "NX100", Cloudy, 3, { 1.936233, 1, 1.023455, 0 } },
- { "SAMSUNG", "NX100", Cloudy, 4, { 1.967852, 1, 0.996834, 0 } },
- { "SAMSUNG", "NX100", Cloudy, 5, { 1.999289, 1, 0.969905, 0 } },
- { "SAMSUNG", "NX100", Cloudy, 6, { 2.030876, 1, 0.943088, 0 } },
- { "SAMSUNG", "NX100", Cloudy, 7, { 2.062458, 1, 0.916275, 0 } },
- { "SAMSUNG", "NX100", WhiteFluorescent, -7, { 1.526020, 1, 2.316638, 0 } },
- { "SAMSUNG", "NX100", WhiteFluorescent, -6, { 1.553140, 1, 2.238212, 0 } },
- { "SAMSUNG", "NX100", WhiteFluorescent, -5, { 1.580015, 1, 2.159785, 0 } },
- { "SAMSUNG", "NX100", WhiteFluorescent, -4, { 1.606890, 1, 2.081603, 0 } },
- { "SAMSUNG", "NX100", WhiteFluorescent, -3, { 1.634009, 1, 2.003176, 0 } },
- { "SAMSUNG", "NX100", WhiteFluorescent, -2, { 1.660884, 1, 1.924750, 0 } },
- { "SAMSUNG", "NX100", WhiteFluorescent, -1, { 1.687760, 1, 1.846567, 0 } },
- { "SAMSUNG", "NX100", WhiteFluorescent, 0, { 1.714879, 1, 1.768141, 0 } },
- { "SAMSUNG", "NX100", WhiteFluorescent, 1, { 1.744197, 1, 1.725140, 0 } },
- { "SAMSUNG", "NX100", WhiteFluorescent, 2, { 1.773516, 1, 1.682140, 0 } },
- { "SAMSUNG", "NX100", WhiteFluorescent, 3, { 1.803078, 1, 1.639384, 0 } },
- { "SAMSUNG", "NX100", WhiteFluorescent, 4, { 1.832397, 1, 1.596384, 0 } },
- { "SAMSUNG", "NX100", WhiteFluorescent, 5, { 1.861959, 1, 1.553384, 0 } },
- { "SAMSUNG", "NX100", WhiteFluorescent, 6, { 1.891522, 1, 1.510628, 0 } },
- { "SAMSUNG", "NX100", WhiteFluorescent, 7, { 1.920596, 1, 1.467628, 0 } },
- { "SAMSUNG", "NX100", NeutralFluorescent, -7, { 1.691180, 1,
1.884437, 0 } },
- { "SAMSUNG", "NX100", NeutralFluorescent, -6, { 1.720987, 1,
1.821158, 0 } },
- { "SAMSUNG", "NX100", NeutralFluorescent, -5, { 1.751038, 1,
1.757146, 0 } },
- { "SAMSUNG", "NX100", NeutralFluorescent, -4, { 1.780845, 1,
1.693379, 0 } },
- { "SAMSUNG", "NX100", NeutralFluorescent, -3, { 1.810897, 1,
1.629612, 0 } },
- { "SAMSUNG", "NX100", NeutralFluorescent, -2, { 1.840704, 1,
1.565844, 0 } },
- { "SAMSUNG", "NX100", NeutralFluorescent, -1, { 1.870755, 1,
1.502077, 0 } },
- { "SAMSUNG", "NX100", NeutralFluorescent, 0, { 1.900318, 1, 1.438309, 0 } },
- { "SAMSUNG", "NX100", NeutralFluorescent, 1, { 1.933056, 1, 1.403616, 0 } },
- { "SAMSUNG", "NX100", NeutralFluorescent, 2, { 1.965795, 1, 1.368678, 0 } },
- { "SAMSUNG", "NX100", NeutralFluorescent, 3, { 1.998045, 1, 1.333741, 0 } },
- { "SAMSUNG", "NX100", NeutralFluorescent, 4, { 2.030784, 1, 1.298803, 0 } },
- { "SAMSUNG", "NX100", NeutralFluorescent, 5, { 2.063279, 1, 1.263621, 0 } },
- { "SAMSUNG", "NX100", NeutralFluorescent, 6, { 2.095773, 1, 1.228927, 0 } },
- { "SAMSUNG", "NX100", NeutralFluorescent, 7, { 2.128756, 1, 1.193990, 0 } },
- { "SAMSUNG", "NX100", DaylightFluorescent, -7, { 1.995358, 1, 1.613731, 0 }
},
- { "SAMSUNG", "NX100", DaylightFluorescent, -6, { 2.030784, 1, 1.559492, 0 }
},
- { "SAMSUNG", "NX100", DaylightFluorescent, -5, { 2.065722, 1, 1.504764, 0 }
},
- { "SAMSUNG", "NX100", DaylightFluorescent, -4, { 2.101393, 1, 1.450037, 0 }
},
- { "SAMSUNG", "NX100", DaylightFluorescent, -3, { 2.136330, 1, 1.395553, 0 }
},
- { "SAMSUNG", "NX100", DaylightFluorescent, -2, { 2.171757, 1, 1.341070, 0 }
},
- { "SAMSUNG", "NX100", DaylightFluorescent, -1, { 2.207183, 1, 1.286343, 0 }
},
- { "SAMSUNG", "NX100", DaylightFluorescent, 0, { 2.242365, 1,
1.231859, 0 } },
- { "SAMSUNG", "NX100", DaylightFluorescent, 1, { 2.280723, 1,
1.202052, 0 } },
- { "SAMSUNG", "NX100", DaylightFluorescent, 2, { 2.319326, 1,
1.172001, 0 } },
- { "SAMSUNG", "NX100", DaylightFluorescent, 3, { 2.357684, 1,
1.142194, 0 } },
- { "SAMSUNG", "NX100", DaylightFluorescent, 4, { 2.396042, 1,
1.112143, 0 } },
- { "SAMSUNG", "NX100", DaylightFluorescent, 5, { 2.434645, 1,
1.082336, 0 } },
- { "SAMSUNG", "NX100", DaylightFluorescent, 6, { 2.473003, 1,
1.052284, 0 } },
- { "SAMSUNG", "NX100", DaylightFluorescent, 7, { 2.511361, 1,
1.022233, 0 } },
- { "SAMSUNG", "NX100", Tungsten, -7, { 0.951650, 1, 3.086007, 0 } },
- { "SAMSUNG", "NX100", Tungsten, -6, { 0.968307, 1, 2.981315, 0 } },
- { "SAMSUNG", "NX100", Tungsten, -5, { 0.985078, 1, 2.877497, 0 } },
- { "SAMSUNG", "NX100", Tungsten, -4, { 1.001710, 1, 2.772538, 0 } },
- { "SAMSUNG", "NX100", Tungsten, -3, { 1.018568, 1, 2.668214, 0 } },
- { "SAMSUNG", "NX100", Tungsten, -2, { 1.035426, 1, 2.563645, 0 } },
- { "SAMSUNG", "NX100", Tungsten, -1, { 1.052284, 1, 2.459565, 0 } },
- { "SAMSUNG", "NX100", Tungsten, 0, { 1.069142, 1, 2.354996, 0 } },
- { "SAMSUNG", "NX100", Tungsten, 1, { 1.087466, 1, 2.298070, 0 } },
- { "SAMSUNG", "NX100", Tungsten, 2, { 1.105790, 1, 2.240655, 0 } },
- { "SAMSUNG", "NX100", Tungsten, 3, { 1.123870, 1, 2.183484, 0 } },
- { "SAMSUNG", "NX100", Tungsten, 4, { 1.142438, 1, 2.126313, 0 } },
- { "SAMSUNG", "NX100", Tungsten, 5, { 1.160762, 1, 2.069142, 0 } },
- { "SAMSUNG", "NX100", Tungsten, 6, { 1.179086, 1, 2.011972, 0 } },
- { "SAMSUNG", "NX100", Tungsten, 7, { 1.197410, 1, 1.954801, 0 } },
- { "SAMSUNG", "NX100", Flash, -7, { 1.843635, 1, 1.282189, 0 } },
- { "SAMSUNG", "NX100", Flash, -6, { 1.876130, 1, 1.238700, 0 } },
- { "SAMSUNG", "NX100", Flash, -5, { 1.908624, 1, 1.195456, 0 } },
- { "SAMSUNG", "NX100", Flash, -4, { 1.941363, 1, 1.151967, 0 } },
- { "SAMSUNG", "NX100", Flash, -3, { 1.973858, 1, 1.108722, 0 } },
- { "SAMSUNG", "NX100", Flash, -2, { 2.006108, 1, 1.064989, 0 } },
- { "SAMSUNG", "NX100", Flash, -1, { 2.038847, 1, 1.021989, 0 } },
- { "SAMSUNG", "NX100", Flash, 0, { 2.071719, 1, 0.978723, 0 } },
- { "SAMSUNG", "NX100", Flash, 1, { 2.107068, 1, 0.954980, 0 } },
- { "SAMSUNG", "NX100", Flash, 2, { 2.142857, 1, 0.931301, 0 } },
- { "SAMSUNG", "NX100", Flash, 3, { 2.178191, 1, 0.907358, 0 } },
- { "SAMSUNG", "NX100", Flash, 4, { 2.213684, 1, 0.883661, 0 } },
- { "SAMSUNG", "NX100", Flash, 5, { 2.249317, 1, 0.859903, 0 } },
- { "SAMSUNG", "NX100", Flash, 6, { 2.284664, 1, 0.836022, 0 } },
- { "SAMSUNG", "NX100", Flash, 7, { 2.320238, 1, 0.812302, 0 } },
- { "SAMSUNG", "NX100", "5000K", 0, { 1.684339, 1, 1.094063, 0 } },
- { "SAMSUNG", "NX100", "5500K", 0, { 1.692022, 1, 0.843950, 0 } },
- { "SAMSUNG", "NX100", "6500K", 0, { 2.110371, 1, 0.879107, 0 } },
-
// Copied from SAMSUNG NX100
{ "SAMSUNG", "NX5", Daylight, -7, { 1.566333, 1, 1.526753, 0 } },
{ "SAMSUNG", "NX5", Daylight, -6, { 1.593941, 1, 1.475202, 0 } },
@@ -6572,6 +6462,125 @@
{ "SAMSUNG", "NX11", "5500K", 0, { 1.692022, 1, 0.843950, 0 } },
{ "SAMSUNG", "NX11", "6500K", 0, { 2.110371, 1, 0.879107, 0 } },
+ // Copied from Samsung NX200
+ { "SAMSUNG", "NX20", Daylight, 0, { 2.773438, 1, 1.625000, 0 } },
+ { "SAMSUNG", "NX20", Cloudy, 0, { 2.902344, 1, 1.546875, 0 } },
+ { "SAMSUNG", "NX20", WhiteFluorescent, 0, { 2.445313, 1, 2.316406, 0 } },
+ { "SAMSUNG", "NX20", NeutralFluorescent, 0, { 2.746094, 1, 1.937500, 0 } },
+ { "SAMSUNG", "NX20", DaylightFluorescent, 0, { 3.214844, 1, 1.679688, 0 } },
+ { "SAMSUNG", "NX20", Tungsten, 0, { 1.511719, 1, 2.941406, 0 } },
+ { "SAMSUNG", "NX20", Flash, 0, { 2.914063, 1, 1.191406, 0 } },
+
+ // SAMSUNG NX100 (firmware 1.12) white balance presets with finetuning steps
+ { "SAMSUNG", "NX100", Daylight, -7, { 1.566333, 1, 1.526753, 0 } },
+ { "SAMSUNG", "NX100", Daylight, -6, { 1.593941, 1, 1.475202, 0 } },
+ { "SAMSUNG", "NX100", Daylight, -5, { 1.621793, 1, 1.423650, 0 } },
+ { "SAMSUNG", "NX100", Daylight, -4, { 1.649401, 1, 1.371854, 0 } },
+ { "SAMSUNG", "NX100", Daylight, -3, { 1.677010, 1, 1.320303, 0 } },
+ { "SAMSUNG", "NX100", Daylight, -2, { 1.704618, 1, 1.268507, 0 } },
+ { "SAMSUNG", "NX100", Daylight, -1, { 1.732470, 1, 1.216956, 0 } },
+ { "SAMSUNG", "NX100", Daylight, 0, { 1.760078, 1, 1.165404, 0 } },
+ { "SAMSUNG", "NX100", Daylight, 1, { 1.790129, 1, 1.137063, 0 } },
+ { "SAMSUNG", "NX100", Daylight, 2, { 1.820425, 1, 1.108722, 0 } },
+ { "SAMSUNG", "NX100", Daylight, 3, { 1.850721, 1, 1.080381, 0 } },
+ { "SAMSUNG", "NX100", Daylight, 4, { 1.880772, 1, 1.052040, 0 } },
+ { "SAMSUNG", "NX100", Daylight, 5, { 1.911068, 1, 1.023699, 0 } },
+ { "SAMSUNG", "NX100", Daylight, 6, { 1.941377, 1, 0.995622, 0 } },
+ { "SAMSUNG", "NX100", Daylight, 7, { 1.971874, 1, 0.967384, 0 } },
+ { "SAMSUNG", "NX100", Cloudy, -7, { 1.638896, 1, 1.446372, 0 } },
+ { "SAMSUNG", "NX100", Cloudy, -6, { 1.667725, 1, 1.397508, 0 } },
+ { "SAMSUNG", "NX100", Cloudy, -5, { 1.696555, 1, 1.348644, 0 } },
+ { "SAMSUNG", "NX100", Cloudy, -4, { 1.725629, 1, 1.299780, 0 } },
+ { "SAMSUNG", "NX100", Cloudy, -3, { 1.754459, 1, 1.250672, 0 } },
+ { "SAMSUNG", "NX100", Cloudy, -2, { 1.783533, 1, 1.201808, 0 } },
+ { "SAMSUNG", "NX100", Cloudy, -1, { 1.812607, 1, 1.152944, 0 } },
+ { "SAMSUNG", "NX100", Cloudy, 0, { 1.841437, 1, 1.103836, 0 } },
+ { "SAMSUNG", "NX100", Cloudy, 1, { 1.872954, 1, 1.077205, 0 } },
+ { "SAMSUNG", "NX100", Cloudy, 2, { 1.904471, 1, 1.050330, 0 } },
+ { "SAMSUNG", "NX100", Cloudy, 3, { 1.936233, 1, 1.023455, 0 } },
+ { "SAMSUNG", "NX100", Cloudy, 4, { 1.967852, 1, 0.996834, 0 } },
+ { "SAMSUNG", "NX100", Cloudy, 5, { 1.999289, 1, 0.969905, 0 } },
+ { "SAMSUNG", "NX100", Cloudy, 6, { 2.030876, 1, 0.943088, 0 } },
+ { "SAMSUNG", "NX100", Cloudy, 7, { 2.062458, 1, 0.916275, 0 } },
+ { "SAMSUNG", "NX100", WhiteFluorescent, -7, { 1.526020, 1, 2.316638, 0 } },
+ { "SAMSUNG", "NX100", WhiteFluorescent, -6, { 1.553140, 1, 2.238212, 0 } },
+ { "SAMSUNG", "NX100", WhiteFluorescent, -5, { 1.580015, 1, 2.159785, 0 } },
+ { "SAMSUNG", "NX100", WhiteFluorescent, -4, { 1.606890, 1, 2.081603, 0 } },
+ { "SAMSUNG", "NX100", WhiteFluorescent, -3, { 1.634009, 1, 2.003176, 0 } },
+ { "SAMSUNG", "NX100", WhiteFluorescent, -2, { 1.660884, 1, 1.924750, 0 } },
+ { "SAMSUNG", "NX100", WhiteFluorescent, -1, { 1.687760, 1, 1.846567, 0 } },
+ { "SAMSUNG", "NX100", WhiteFluorescent, 0, { 1.714879, 1, 1.768141, 0 } },
+ { "SAMSUNG", "NX100", WhiteFluorescent, 1, { 1.744197, 1, 1.725140, 0 } },
+ { "SAMSUNG", "NX100", WhiteFluorescent, 2, { 1.773516, 1, 1.682140, 0 } },
+ { "SAMSUNG", "NX100", WhiteFluorescent, 3, { 1.803078, 1, 1.639384, 0 } },
+ { "SAMSUNG", "NX100", WhiteFluorescent, 4, { 1.832397, 1, 1.596384, 0 } },
+ { "SAMSUNG", "NX100", WhiteFluorescent, 5, { 1.861959, 1, 1.553384, 0 } },
+ { "SAMSUNG", "NX100", WhiteFluorescent, 6, { 1.891522, 1, 1.510628, 0 } },
+ { "SAMSUNG", "NX100", WhiteFluorescent, 7, { 1.920596, 1, 1.467628, 0 } },
+ { "SAMSUNG", "NX100", NeutralFluorescent, -7, { 1.691180, 1,
1.884437, 0 } },
+ { "SAMSUNG", "NX100", NeutralFluorescent, -6, { 1.720987, 1,
1.821158, 0 } },
+ { "SAMSUNG", "NX100", NeutralFluorescent, -5, { 1.751038, 1,
1.757146, 0 } },
+ { "SAMSUNG", "NX100", NeutralFluorescent, -4, { 1.780845, 1,
1.693379, 0 } },
+ { "SAMSUNG", "NX100", NeutralFluorescent, -3, { 1.810897, 1,
1.629612, 0 } },
+ { "SAMSUNG", "NX100", NeutralFluorescent, -2, { 1.840704, 1,
1.565844, 0 } },
+ { "SAMSUNG", "NX100", NeutralFluorescent, -1, { 1.870755, 1,
1.502077, 0 } },
+ { "SAMSUNG", "NX100", NeutralFluorescent, 0, { 1.900318, 1, 1.438309, 0 } },
+ { "SAMSUNG", "NX100", NeutralFluorescent, 1, { 1.933056, 1, 1.403616, 0 } },
+ { "SAMSUNG", "NX100", NeutralFluorescent, 2, { 1.965795, 1, 1.368678, 0 } },
+ { "SAMSUNG", "NX100", NeutralFluorescent, 3, { 1.998045, 1, 1.333741, 0 } },
+ { "SAMSUNG", "NX100", NeutralFluorescent, 4, { 2.030784, 1, 1.298803, 0 } },
+ { "SAMSUNG", "NX100", NeutralFluorescent, 5, { 2.063279, 1, 1.263621, 0 } },
+ { "SAMSUNG", "NX100", NeutralFluorescent, 6, { 2.095773, 1, 1.228927, 0 } },
+ { "SAMSUNG", "NX100", NeutralFluorescent, 7, { 2.128756, 1, 1.193990, 0 } },
+ { "SAMSUNG", "NX100", DaylightFluorescent, -7, { 1.995358, 1, 1.613731, 0 }
},
+ { "SAMSUNG", "NX100", DaylightFluorescent, -6, { 2.030784, 1, 1.559492, 0 }
},
+ { "SAMSUNG", "NX100", DaylightFluorescent, -5, { 2.065722, 1, 1.504764, 0 }
},
+ { "SAMSUNG", "NX100", DaylightFluorescent, -4, { 2.101393, 1, 1.450037, 0 }
},
+ { "SAMSUNG", "NX100", DaylightFluorescent, -3, { 2.136330, 1, 1.395553, 0 }
},
+ { "SAMSUNG", "NX100", DaylightFluorescent, -2, { 2.171757, 1, 1.341070, 0 }
},
+ { "SAMSUNG", "NX100", DaylightFluorescent, -1, { 2.207183, 1, 1.286343, 0 }
},
+ { "SAMSUNG", "NX100", DaylightFluorescent, 0, { 2.242365, 1,
1.231859, 0 } },
+ { "SAMSUNG", "NX100", DaylightFluorescent, 1, { 2.280723, 1,
1.202052, 0 } },
+ { "SAMSUNG", "NX100", DaylightFluorescent, 2, { 2.319326, 1,
1.172001, 0 } },
+ { "SAMSUNG", "NX100", DaylightFluorescent, 3, { 2.357684, 1,
1.142194, 0 } },
+ { "SAMSUNG", "NX100", DaylightFluorescent, 4, { 2.396042, 1,
1.112143, 0 } },
+ { "SAMSUNG", "NX100", DaylightFluorescent, 5, { 2.434645, 1,
1.082336, 0 } },
+ { "SAMSUNG", "NX100", DaylightFluorescent, 6, { 2.473003, 1,
1.052284, 0 } },
+ { "SAMSUNG", "NX100", DaylightFluorescent, 7, { 2.511361, 1,
1.022233, 0 } },
+ { "SAMSUNG", "NX100", Tungsten, -7, { 0.951650, 1, 3.086007, 0 } },
+ { "SAMSUNG", "NX100", Tungsten, -6, { 0.968307, 1, 2.981315, 0 } },
+ { "SAMSUNG", "NX100", Tungsten, -5, { 0.985078, 1, 2.877497, 0 } },
+ { "SAMSUNG", "NX100", Tungsten, -4, { 1.001710, 1, 2.772538, 0 } },
+ { "SAMSUNG", "NX100", Tungsten, -3, { 1.018568, 1, 2.668214, 0 } },
+ { "SAMSUNG", "NX100", Tungsten, -2, { 1.035426, 1, 2.563645, 0 } },
+ { "SAMSUNG", "NX100", Tungsten, -1, { 1.052284, 1, 2.459565, 0 } },
+ { "SAMSUNG", "NX100", Tungsten, 0, { 1.069142, 1, 2.354996, 0 } },
+ { "SAMSUNG", "NX100", Tungsten, 1, { 1.087466, 1, 2.298070, 0 } },
+ { "SAMSUNG", "NX100", Tungsten, 2, { 1.105790, 1, 2.240655, 0 } },
+ { "SAMSUNG", "NX100", Tungsten, 3, { 1.123870, 1, 2.183484, 0 } },
+ { "SAMSUNG", "NX100", Tungsten, 4, { 1.142438, 1, 2.126313, 0 } },
+ { "SAMSUNG", "NX100", Tungsten, 5, { 1.160762, 1, 2.069142, 0 } },
+ { "SAMSUNG", "NX100", Tungsten, 6, { 1.179086, 1, 2.011972, 0 } },
+ { "SAMSUNG", "NX100", Tungsten, 7, { 1.197410, 1, 1.954801, 0 } },
+ { "SAMSUNG", "NX100", Flash, -7, { 1.843635, 1, 1.282189, 0 } },
+ { "SAMSUNG", "NX100", Flash, -6, { 1.876130, 1, 1.238700, 0 } },
+ { "SAMSUNG", "NX100", Flash, -5, { 1.908624, 1, 1.195456, 0 } },
+ { "SAMSUNG", "NX100", Flash, -4, { 1.941363, 1, 1.151967, 0 } },
+ { "SAMSUNG", "NX100", Flash, -3, { 1.973858, 1, 1.108722, 0 } },
+ { "SAMSUNG", "NX100", Flash, -2, { 2.006108, 1, 1.064989, 0 } },
+ { "SAMSUNG", "NX100", Flash, -1, { 2.038847, 1, 1.021989, 0 } },
+ { "SAMSUNG", "NX100", Flash, 0, { 2.071719, 1, 0.978723, 0 } },
+ { "SAMSUNG", "NX100", Flash, 1, { 2.107068, 1, 0.954980, 0 } },
+ { "SAMSUNG", "NX100", Flash, 2, { 2.142857, 1, 0.931301, 0 } },
+ { "SAMSUNG", "NX100", Flash, 3, { 2.178191, 1, 0.907358, 0 } },
+ { "SAMSUNG", "NX100", Flash, 4, { 2.213684, 1, 0.883661, 0 } },
+ { "SAMSUNG", "NX100", Flash, 5, { 2.249317, 1, 0.859903, 0 } },
+ { "SAMSUNG", "NX100", Flash, 6, { 2.284664, 1, 0.836022, 0 } },
+ { "SAMSUNG", "NX100", Flash, 7, { 2.320238, 1, 0.812302, 0 } },
+ { "SAMSUNG", "NX100", "5000K", 0, { 1.684339, 1, 1.094063, 0 } },
+ { "SAMSUNG", "NX100", "5500K", 0, { 1.692022, 1, 0.843950, 0 } },
+ { "SAMSUNG", "NX100", "6500K", 0, { 2.110371, 1, 0.879107, 0 } },
+
// SAMSUNG NX200 Firmware Version 1.04
{ "SAMSUNG", "NX200", Daylight, 0, { 2.773438, 1, 1.625000, 0 } },
{ "SAMSUNG", "NX200", Cloudy, 0, { 2.902344, 1, 1.546875, 0 } },
@@ -6581,6 +6590,143 @@
{ "SAMSUNG", "NX200", Tungsten, 0, { 1.511719, 1, 2.941406, 0 } },
{ "SAMSUNG", "NX200", Flash, 0, { 2.914063, 1, 1.191406, 0 } },
+ // Copied from Samsung NX200
+ { "SAMSUNG", "NX210", Daylight, 0, { 2.773438, 1, 1.625000, 0 } },
+ { "SAMSUNG", "NX210", Cloudy, 0, { 2.902344, 1, 1.546875, 0 } },
+ { "SAMSUNG", "NX210", WhiteFluorescent, 0, { 2.445313, 1, 2.316406, 0 } },
+ { "SAMSUNG", "NX210", NeutralFluorescent, 0, { 2.746094, 1, 1.937500, 0 } },
+ { "SAMSUNG", "NX210", DaylightFluorescent, 0, { 3.214844, 1,
1.679688, 0 } },
+ { "SAMSUNG", "NX210", Tungsten, 0, { 1.511719, 1, 2.941406, 0 } },
+ { "SAMSUNG", "NX210", Flash, 0, { 2.914063, 1, 1.191406, 0 } },
+
+ // SAMSUNG NX300 Firmware Version 1.40
+ { "SAMSUNG", "NX300", Daylight, -7, { 2.308594, 1, 2.097656, 0 } },
+ { "SAMSUNG", "NX300", Daylight, -6, { 2.347656, 1, 2.027344, 0 } },
+ { "SAMSUNG", "NX300", Daylight, -5, { 2.390625, 1, 1.953125, 0 } },
+ { "SAMSUNG", "NX300", Daylight, -4, { 2.429688, 1, 1.882813, 0 } },
+ { "SAMSUNG", "NX300", Daylight, -3, { 2.472656, 1, 1.812500, 0 } },
+ { "SAMSUNG", "NX300", Daylight, -2, { 2.511719, 1, 1.742188, 0 } },
+ { "SAMSUNG", "NX300", Daylight, -1, { 2.554688, 1, 1.671875, 0 } },
+ { "SAMSUNG", "NX300", Daylight, 0, { 2.593750, 1, 1.601563, 0 } },
+ { "SAMSUNG", "NX300", Daylight, 1, { 2.636719, 1, 1.562500, 0 } },
+ { "SAMSUNG", "NX300", Daylight, 2, { 2.683594, 1, 1.523438, 0 } },
+ { "SAMSUNG", "NX300", Daylight, 3, { 2.726563, 1, 1.484375, 0 } },
+ { "SAMSUNG", "NX300", Daylight, 4, { 2.773438, 1, 1.445313, 0 } },
+ { "SAMSUNG", "NX300", Daylight, 5, { 2.816406, 1, 1.406250, 0 } },
+ { "SAMSUNG", "NX300", Daylight, 6, { 2.859375, 1, 1.367188, 0 } },
+ { "SAMSUNG", "NX300", Daylight, 7, { 2.906250, 1, 1.328125, 0 } },
+ { "SAMSUNG", "NX300", Cloudy, -7, { 2.394531, 1, 2.011719, 0 } },
+ { "SAMSUNG", "NX300", Cloudy, -6, { 2.433594, 1, 1.945313, 0 } },
+ { "SAMSUNG", "NX300", Cloudy, -5, { 2.476563, 1, 1.878906, 0 } },
+ { "SAMSUNG", "NX300", Cloudy, -4, { 2.519531, 1, 1.808594, 0 } },
+ { "SAMSUNG", "NX300", Cloudy, -3, { 2.562500, 1, 1.742188, 0 } },
+ { "SAMSUNG", "NX300", Cloudy, -2, { 2.605469, 1, 1.671875, 0 } },
+ { "SAMSUNG", "NX300", Cloudy, -1, { 2.644531, 1, 1.605469, 0 } },
+ { "SAMSUNG", "NX300", Cloudy, 0, { 2.687500, 1, 1.535156, 0 } },
+ { "SAMSUNG", "NX300", Cloudy, 1, { 2.734375, 1, 1.500000, 0 } },
+ { "SAMSUNG", "NX300", Cloudy, 2, { 2.781250, 1, 1.460938, 0 } },
+ { "SAMSUNG", "NX300", Cloudy, 3, { 2.828125, 1, 1.425781, 0 } },
+ { "SAMSUNG", "NX300", Cloudy, 4, { 2.875000, 1, 1.386719, 0 } },
+ { "SAMSUNG", "NX300", Cloudy, 5, { 2.917969, 1, 1.351563, 0 } },
+ { "SAMSUNG", "NX300", Cloudy, 6, { 2.964844, 1, 1.312500, 0 } },
+ { "SAMSUNG", "NX300", Cloudy, 7, { 3.011719, 1, 1.273438, 0 } },
+ { "SAMSUNG", "NX300", CoolWhiteFluorescent, -7, { 2.000000, 1, 2.933594, 0 }
},
+ { "SAMSUNG", "NX300", CoolWhiteFluorescent, -6, { 2.035156, 1, 2.835938, 0 }
},
+ { "SAMSUNG", "NX300", CoolWhiteFluorescent, -5, { 2.070313, 1, 2.734375, 0 }
},
+ { "SAMSUNG", "NX300", CoolWhiteFluorescent, -4, { 2.105469, 1, 2.636719, 0 }
},
+ { "SAMSUNG", "NX300", CoolWhiteFluorescent, -3, { 2.140625, 1, 2.539063, 0 }
},
+ { "SAMSUNG", "NX300", CoolWhiteFluorescent, -2, { 2.175781, 1, 2.437500, 0 }
},
+ { "SAMSUNG", "NX300", CoolWhiteFluorescent, -1, { 2.214844, 1, 2.339844, 0 }
},
+ { "SAMSUNG", "NX300", CoolWhiteFluorescent, 0, { 2.250000, 1, 2.238281, 0 }
},
+ { "SAMSUNG", "NX300", CoolWhiteFluorescent, 1, { 2.285156, 1, 2.183594, 0 }
},
+ { "SAMSUNG", "NX300", CoolWhiteFluorescent, 2, { 2.324219, 1, 2.128906, 0 }
},
+ { "SAMSUNG", "NX300", CoolWhiteFluorescent, 3, { 2.363281, 1, 2.078125, 0 }
},
+ { "SAMSUNG", "NX300", CoolWhiteFluorescent, 4, { 2.402344, 1, 2.023438, 0 }
},
+ { "SAMSUNG", "NX300", CoolWhiteFluorescent, 5, { 2.441406, 1, 1.968750, 0 }
},
+ { "SAMSUNG", "NX300", CoolWhiteFluorescent, 6, { 2.480469, 1, 1.914063, 0 }
},
+ { "SAMSUNG", "NX300", CoolWhiteFluorescent, 7, { 2.519531, 1, 1.859375, 0 }
},
+ { "SAMSUNG", "NX300", DayWhiteFluorescent, -7, { 2.253906, 1, 2.445313, 0 }
},
+ { "SAMSUNG", "NX300", DayWhiteFluorescent, -6, { 2.292969, 1, 2.363281, 0 }
},
+ { "SAMSUNG", "NX300", DayWhiteFluorescent, -5, { 2.332031, 1, 2.281250, 0 }
},
+ { "SAMSUNG", "NX300", DayWhiteFluorescent, -4, { 2.371094, 1, 2.199219, 0 }
},
+ { "SAMSUNG", "NX300", DayWhiteFluorescent, -3, { 2.410156, 1, 2.117188, 0 }
},
+ { "SAMSUNG", "NX300", DayWhiteFluorescent, -2, { 2.453125, 1, 2.031250, 0 }
},
+ { "SAMSUNG", "NX300", DayWhiteFluorescent, -1, { 2.492188, 1, 1.949219, 0 }
},
+ { "SAMSUNG", "NX300", DayWhiteFluorescent, 0, { 2.531250, 1,
1.867188, 0 } },
+ { "SAMSUNG", "NX300", DayWhiteFluorescent, 1, { 2.574219, 1,
1.820313, 0 } },
+ { "SAMSUNG", "NX300", DayWhiteFluorescent, 2, { 2.617188, 1,
1.777344, 0 } },
+ { "SAMSUNG", "NX300", DayWhiteFluorescent, 3, { 2.660156, 1,
1.730469, 0 } },
+ { "SAMSUNG", "NX300", DayWhiteFluorescent, 4, { 2.703125, 1,
1.687500, 0 } },
+ { "SAMSUNG", "NX300", DayWhiteFluorescent, 5, { 2.750000, 1,
1.640625, 0 } },
+ { "SAMSUNG", "NX300", DayWhiteFluorescent, 6, { 2.792969, 1,
1.593750, 0 } },
+ { "SAMSUNG", "NX300", DayWhiteFluorescent, 7, { 2.835938, 1,
1.550781, 0 } },
+ { "SAMSUNG", "NX300", DaylightFluorescent, -7, { 2.699219, 1, 2.128906, 0 }
},
+ { "SAMSUNG", "NX300", DaylightFluorescent, -6, { 2.746094, 1, 2.054688, 0 }
},
+ { "SAMSUNG", "NX300", DaylightFluorescent, -5, { 2.792969, 1, 1.984375, 0 }
},
+ { "SAMSUNG", "NX300", DaylightFluorescent, -4, { 2.839844, 1, 1.910156, 0 }
},
+ { "SAMSUNG", "NX300", DaylightFluorescent, -3, { 2.890625, 1, 1.839844, 0 }
},
+ { "SAMSUNG", "NX300", DaylightFluorescent, -2, { 2.937500, 1, 1.765625, 0 }
},
+ { "SAMSUNG", "NX300", DaylightFluorescent, -1, { 2.984375, 1, 1.695313, 0 }
},
+ { "SAMSUNG", "NX300", DaylightFluorescent, 0, { 3.031250, 1,
1.625000, 0 } },
+ { "SAMSUNG", "NX300", DaylightFluorescent, 1, { 3.082031, 1,
1.582031, 0 } },
+ { "SAMSUNG", "NX300", DaylightFluorescent, 2, { 3.136719, 1,
1.542969, 0 } },
+ { "SAMSUNG", "NX300", DaylightFluorescent, 3, { 3.187500, 1,
1.503906, 0 } },
+ { "SAMSUNG", "NX300", DaylightFluorescent, 4, { 3.238281, 1,
1.464844, 0 } },
+ { "SAMSUNG", "NX300", DaylightFluorescent, 5, { 3.292969, 1,
1.425781, 0 } },
+ { "SAMSUNG", "NX300", DaylightFluorescent, 6, { 3.343750, 1,
1.386719, 0 } },
+ { "SAMSUNG", "NX300", DaylightFluorescent, 7, { 3.394531, 1,
1.347656, 0 } },
+ { "SAMSUNG", "NX300", Tungsten, -7, { 1.390625, 1, 3.695313, 0 } },
+ { "SAMSUNG", "NX300", Tungsten, -6, { 1.414063, 1, 3.570313, 0 } },
+ { "SAMSUNG", "NX300", Tungsten, -5, { 1.437500, 1, 3.445313, 0 } },
+ { "SAMSUNG", "NX300", Tungsten, -4, { 1.460938, 1, 3.320313, 0 } },
+ { "SAMSUNG", "NX300", Tungsten, -3, { 1.488281, 1, 3.195313, 0 } },
+ { "SAMSUNG", "NX300", Tungsten, -2, { 1.511719, 1, 3.070313, 0 } },
+ { "SAMSUNG", "NX300", Tungsten, -1, { 1.535156, 1, 2.945313, 0 } },
+ { "SAMSUNG", "NX300", Tungsten, 0, { 1.562500, 1, 2.820313, 0 } },
+ { "SAMSUNG", "NX300", Tungsten, 1, { 1.585938, 1, 2.753906, 0 } },
+ { "SAMSUNG", "NX300", Tungsten, 2, { 1.613281, 1, 2.683594, 0 } },
+ { "SAMSUNG", "NX300", Tungsten, 3, { 1.640625, 1, 2.617188, 0 } },
+ { "SAMSUNG", "NX300", Tungsten, 4, { 1.667969, 1, 2.546875, 0 } },
+ { "SAMSUNG", "NX300", Tungsten, 5, { 1.695313, 1, 2.480469, 0 } },
+ { "SAMSUNG", "NX300", Tungsten, 6, { 1.722656, 1, 2.410156, 0 } },
+ { "SAMSUNG", "NX300", Tungsten, 7, { 1.750000, 1, 2.339844, 0 } },
+ { "SAMSUNG", "NX300", Flash, -7, { 2.613281, 1, 1.957031, 0 } },
+ { "SAMSUNG", "NX300", Flash, -6, { 2.660156, 1, 1.890625, 0 } },
+ { "SAMSUNG", "NX300", Flash, -5, { 2.707031, 1, 1.824219, 0 } },
+ { "SAMSUNG", "NX300", Flash, -4, { 2.753906, 1, 1.757813, 0 } },
+ { "SAMSUNG", "NX300", Flash, -3, { 2.800781, 1, 1.691406, 0 } },
+ { "SAMSUNG", "NX300", Flash, -2, { 2.843750, 1, 1.625000, 0 } },
+ { "SAMSUNG", "NX300", Flash, -1, { 2.890625, 1, 1.558594, 0 } },
+ { "SAMSUNG", "NX300", Flash, 0, { 2.937500, 1, 1.492188, 0 } },
+ { "SAMSUNG", "NX300", Flash, 1, { 2.988281, 1, 1.457031, 0 } },
+ { "SAMSUNG", "NX300", Flash, 2, { 3.039063, 1, 1.421875, 0 } },
+ { "SAMSUNG", "NX300", Flash, 3, { 3.089844, 1, 1.386719, 0 } },
+ { "SAMSUNG", "NX300", Flash, 4, { 3.140625, 1, 1.347656, 0 } },
+ { "SAMSUNG", "NX300", Flash, 5, { 3.191406, 1, 1.312500, 0 } },
+ { "SAMSUNG", "NX300", Flash, 6, { 3.238281, 1, 1.277344, 0 } },
+ { "SAMSUNG", "NX300", Flash, 7, { 3.289063, 1, 1.238281, 0 } },
+ { "SAMSUNG", "NX300", "5000K", 0, { 2.402344, 1, 1.945313, 0 } },
+ { "SAMSUNG", "NX300", "5500K", 0, { 2.636719, 1, 1.792969, 0 } },
+ { "SAMSUNG", "NX300", "6500K", 0, { 3.003906, 1, 1.644531, 0 } },
+
+ // Copied from Samsung NX200
+ { "SAMSUNG", "NX1000", Daylight, 0, { 2.773438, 1, 1.625000, 0 } },
+ { "SAMSUNG", "NX1000", Cloudy, 0, { 2.902344, 1, 1.546875, 0 } },
+ { "SAMSUNG", "NX1000", WhiteFluorescent, 0, { 2.445313, 1, 2.316406, 0 } },
+ { "SAMSUNG", "NX1000", NeutralFluorescent, 0, { 2.746094, 1,
1.937500, 0 } },
+ { "SAMSUNG", "NX1000", DaylightFluorescent, 0, { 3.214844, 1, 1.679688, 0 }
},
+ { "SAMSUNG", "NX1000", Tungsten, 0, { 1.511719, 1, 2.941406, 0 } },
+ { "SAMSUNG", "NX1000", Flash, 0, { 2.914063, 1, 1.191406, 0 } },
+
+ // Copied from Samsung NX200
+ { "SAMSUNG", "NX1100", Daylight, 0, { 2.773438, 1, 1.625000, 0 } },
+ { "SAMSUNG", "NX1100", Cloudy, 0, { 2.902344, 1, 1.546875, 0 } },
+ { "SAMSUNG", "NX1100", WhiteFluorescent, 0, { 2.445313, 1, 2.316406, 0 } },
+ { "SAMSUNG", "NX1100", NeutralFluorescent, 0, { 2.746094, 1,
1.937500, 0 } },
+ { "SAMSUNG", "NX1100", DaylightFluorescent, 0, { 3.214844, 1, 1.679688, 0 }
},
+ { "SAMSUNG", "NX1100", Tungsten, 0, { 1.511719, 1, 2.941406, 0 } },
+ { "SAMSUNG", "NX1100", 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 } },
------------------------------------------------------------------------------
"Accelerate Dev Cycles with Automated Cross-Browser Testing - For FREE
Instantly run your Selenium tests across 300+ browser/OS combos.
Get unparalleled scalability from the best Selenium testing platform available
Simple to use. Nothing to install. Get started now for free."
http://p.sf.net/sfu/SauceLabs
_______________________________________________
ufraw-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs
