Update of /cvsroot/ufraw/ufraw
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv5638
Modified Files:
wb_presets.c
Log Message:
Use consistent naming for fluorescent and incandescent presets on OLYMPUS DSLR
cameras.
Index: wb_presets.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/wb_presets.c,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -d -r1.138 -r1.139
--- wb_presets.c 31 Dec 2009 03:30:34 -0000 1.138
+++ wb_presets.c 31 Dec 2009 04:00:11 -0000 1.139
@@ -1912,36 +1912,6 @@
{ "OLYMPUS", "C8080WZ", Tungsten, 7, { 2.140625, 1, 1.828125, 0 } },
/*3000K*/
// Fin ajout
- { "OLYMPUS", "E-1", Tungsten, -7, { 1.015625, 1, 1.867188, 0 } },
/*3000K*/
- { "OLYMPUS", "E-1", Tungsten, -6, { 1.007812, 1, 1.875000, 0 } },
/*3000K*/
- { "OLYMPUS", "E-1", Tungsten, -5, { 1, 1, 1.890625, 0 } },
/*3000K*/
- { "OLYMPUS", "E-1", Tungsten, -4, { 1, 1.007874, 1.913386, 0 } },
/*3000K*/
- { "OLYMPUS", "E-1", Tungsten, -3, { 1, 1.015873, 1.944444, 0 } },
/*3000K*/
- { "OLYMPUS", "E-1", Tungsten, -2, { 1, 1.015873, 1.952381, 0 } },
/*3000K*/
- { "OLYMPUS", "E-1", Tungsten, -1, { 1, 1.024000, 1.984000, 0 } },
/*3000K*/
- { "OLYMPUS", "E-1", Tungsten, 0, { 1, 1.024000, 1.992000, 0 } },
/*3000K*/
- { "OLYMPUS", "E-1", Tungsten, 1, { 1, 1.032258, 2.008065, 0 } },
/*3000K*/
- { "OLYMPUS", "E-1", Tungsten, 2, { 1, 1.040650, 2.040650, 0 } },
/*3000K*/
- { "OLYMPUS", "E-1", Tungsten, 3, { 1, 1.040650, 2.048780, 0 } },
/*3000K*/
- { "OLYMPUS", "E-1", Tungsten, 4, { 1, 1.049180, 2.081967, 0 } },
/*3000K*/
- { "OLYMPUS", "E-1", Tungsten, 5, { 1, 1.057851, 2.107438, 0 } },
/*3000K*/
- { "OLYMPUS", "E-1", Tungsten, 6, { 1, 1.066667, 2.141667, 0 } },
/*3000K*/
- { "OLYMPUS", "E-1", Tungsten, 7, { 1, 1.075630, 2.168067, 0 } },
/*3000K*/
- { "OLYMPUS", "E-1", "3300K", -7, { 1.109375, 1, 1.695312, 0 } },
- { "OLYMPUS", "E-1", "3300K", -6, { 1.101562, 1, 1.710938, 0 } },
- { "OLYMPUS", "E-1", "3300K", -5, { 1.093750, 1, 1.718750, 0 } },
- { "OLYMPUS", "E-1", "3300K", -4, { 1.093750, 1, 1.734375, 0 } },
- { "OLYMPUS", "E-1", "3300K", -3, { 1.085938, 1, 1.742188, 0 } },
- { "OLYMPUS", "E-1", "3300K", -2, { 1.078125, 1, 1.750000, 0 } },
- { "OLYMPUS", "E-1", "3300K", -1, { 1.070312, 1, 1.765625, 0 } },
- { "OLYMPUS", "E-1", "3300K", 0, { 1.070312, 1, 1.773438, 0 } },
- { "OLYMPUS", "E-1", "3300K", 1, { 1.054688, 1, 1.781250, 0 } },
- { "OLYMPUS", "E-1", "3300K", 2, { 1.046875, 1, 1.796875, 0 } },
- { "OLYMPUS", "E-1", "3300K", 3, { 1.046875, 1, 1.804688, 0 } },
- { "OLYMPUS", "E-1", "3300K", 4, { 1.039062, 1, 1.820312, 0 } },
- { "OLYMPUS", "E-1", "3300K", 5, { 1.031250, 1, 1.828125, 0 } },
- { "OLYMPUS", "E-1", "3300K", 6, { 1.023438, 1, 1.843750, 0 } },
- { "OLYMPUS", "E-1", "3300K", 7, { 1.015625, 1, 1.851562, 0 } },
{ "OLYMPUS", "E-1", Incandescent, -7, { 1.195312, 1,
1.562500, 0 } }, /*3600K*/
{ "OLYMPUS", "E-1", Incandescent, -6, { 1.187500, 1,
1.578125, 0 } }, /*3600K*/
{ "OLYMPUS", "E-1", Incandescent, -5, { 1.187500, 1,
1.585938, 0 } }, /*3600K*/
@@ -1957,21 +1927,21 @@
{ "OLYMPUS", "E-1", Incandescent, 5, { 1.117188, 1, 1.695312, 0 } },
/*3600K*/
{ "OLYMPUS", "E-1", Incandescent, 6, { 1.109375, 1, 1.703125, 0 } },
/*3600K*/
{ "OLYMPUS", "E-1", Incandescent, 7, { 1.101562, 1, 1.718750, 0 } },
/*3600K*/
- { "OLYMPUS", "E-1", "3900K", -7, { 1.335938, 1, 1.414062, 0 } },
- { "OLYMPUS", "E-1", "3900K", -6, { 1.320312, 1, 1.429688, 0 } },
- { "OLYMPUS", "E-1", "3900K", -5, { 1.304688, 1, 1.445312, 0 } },
- { "OLYMPUS", "E-1", "3900K", -4, { 1.289062, 1, 1.460938, 0 } },
- { "OLYMPUS", "E-1", "3900K", -3, { 1.273438, 1, 1.476562, 0 } },
- { "OLYMPUS", "E-1", "3900K", -2, { 1.257812, 1, 1.492188, 0 } },
- { "OLYMPUS", "E-1", "3900K", -1, { 1.242188, 1, 1.507812, 0 } },
- { "OLYMPUS", "E-1", "3900K", 0, { 1.234375, 1, 1.523438, 0 } },
- { "OLYMPUS", "E-1", "3900K", 1, { 1.218750, 1, 1.531250, 0 } },
- { "OLYMPUS", "E-1", "3900K", 2, { 1.210938, 1, 1.546875, 0 } },
- { "OLYMPUS", "E-1", "3900K", 3, { 1.203125, 1, 1.554688, 0 } },
- { "OLYMPUS", "E-1", "3900K", 4, { 1.195312, 1, 1.562500, 0 } },
- { "OLYMPUS", "E-1", "3900K", 5, { 1.187500, 1, 1.578125, 0 } },
- { "OLYMPUS", "E-1", "3900K", 6, { 1.187500, 1, 1.585938, 0 } },
- { "OLYMPUS", "E-1", "3900K", 7, { 1.179688, 1, 1.601562, 0 } },
+ { "OLYMPUS", "E-1", IncandescentWarm, -7, { 1.015625, 1, 1.867188, 0 } },
/*3000K*/
+ { "OLYMPUS", "E-1", IncandescentWarm, -6, { 1.007812, 1, 1.875000, 0 } },
/*3000K*/
+ { "OLYMPUS", "E-1", IncandescentWarm, -5, { 1.000000, 1, 1.890625, 0 } },
/*3000K*/
+ { "OLYMPUS", "E-1", IncandescentWarm, -4, { 1, 1.007874, 1.913386, 0 } },
/*3000K*/
+ { "OLYMPUS", "E-1", IncandescentWarm, -3, { 1, 1.015873, 1.944444, 0 } },
/*3000K*/
+ { "OLYMPUS", "E-1", IncandescentWarm, -2, { 1, 1.015873, 1.952381, 0 } },
/*3000K*/
+ { "OLYMPUS", "E-1", IncandescentWarm, -1, { 1, 1.024000, 1.984000, 0 } },
/*3000K*/
+ { "OLYMPUS", "E-1", IncandescentWarm, 0, { 1, 1.024000, 1.992000, 0 } },
/*3000K*/
+ { "OLYMPUS", "E-1", IncandescentWarm, 1, { 1, 1.032258, 2.008065, 0 } },
/*3000K*/
+ { "OLYMPUS", "E-1", IncandescentWarm, 2, { 1, 1.040650, 2.040650, 0 } },
/*3000K*/
+ { "OLYMPUS", "E-1", IncandescentWarm, 3, { 1, 1.040650, 2.048780, 0 } },
/*3000K*/
+ { "OLYMPUS", "E-1", IncandescentWarm, 4, { 1, 1.049180, 2.081967, 0 } },
/*3000K*/
+ { "OLYMPUS", "E-1", IncandescentWarm, 5, { 1, 1.057851, 2.107438, 0 } },
/*3000K*/
+ { "OLYMPUS", "E-1", IncandescentWarm, 6, { 1, 1.066667, 2.141667, 0 } },
/*3000K*/
+ { "OLYMPUS", "E-1", IncandescentWarm, 7, { 1, 1.075630, 2.168067, 0 } },
/*3000K*/
{ "OLYMPUS", "E-1", WhiteFluorescent, -7, { 2.296875, 1, 1.445312, 0 } },
/*4000K*/
{ "OLYMPUS", "E-1", WhiteFluorescent, -6, { 2.273438, 1, 1.468750, 0 } },
/*4000K*/
{ "OLYMPUS", "E-1", WhiteFluorescent, -5, { 2.242188, 1, 1.492188, 0 } },
/*4000K*/
@@ -1987,21 +1957,6 @@
{ "OLYMPUS", "E-1", WhiteFluorescent, 5, { 1.968750, 1, 1.812500, 0 } },
/*4000K*/
{ "OLYMPUS", "E-1", WhiteFluorescent, 6, { 1.945312, 1, 1.835938, 0 } },
/*4000K*/
{ "OLYMPUS", "E-1", WhiteFluorescent, 7, { 1.929688, 1, 1.867188, 0 } },
/*4000K*/
- { "OLYMPUS", "E-1", "4300K", -7, { 1.484375, 1, 1.281250, 0 } },
- { "OLYMPUS", "E-1", "4300K", -6, { 1.468750, 1, 1.289062, 0 } },
- { "OLYMPUS", "E-1", "4300K", -5, { 1.460938, 1, 1.296875, 0 } },
- { "OLYMPUS", "E-1", "4300K", -4, { 1.445312, 1, 1.304688, 0 } },
- { "OLYMPUS", "E-1", "4300K", -3, { 1.437500, 1, 1.312500, 0 } },
- { "OLYMPUS", "E-1", "4300K", -2, { 1.429688, 1, 1.328125, 0 } },
- { "OLYMPUS", "E-1", "4300K", -1, { 1.414062, 1, 1.335938, 0 } },
- { "OLYMPUS", "E-1", "4300K", 0, { 1.414062, 1, 1.343750, 0 } },
- { "OLYMPUS", "E-1", "4300K", 1, { 1.390625, 1, 1.359375, 0 } },
- { "OLYMPUS", "E-1", "4300K", 2, { 1.375000, 1, 1.375000, 0 } },
- { "OLYMPUS", "E-1", "4300K", 3, { 1.359375, 1, 1.390625, 0 } },
- { "OLYMPUS", "E-1", "4300K", 4, { 1.343750, 1, 1.406250, 0 } },
- { "OLYMPUS", "E-1", "4300K", 5, { 1.328125, 1, 1.421875, 0 } },
- { "OLYMPUS", "E-1", "4300K", 6, { 1.312500, 1, 1.437500, 0 } },
- { "OLYMPUS", "E-1", "4300K", 7, { 1.296875, 1, 1.453125, 0 } },
{ "OLYMPUS", "E-1", NeutralFluorescent, -7, { 1.984375, 1, 1.203125, 0 } },
/*4500K*/
{ "OLYMPUS", "E-1", NeutralFluorescent, -6, { 1.960938, 1, 1.218750, 0 } },
/*4500K*/
{ "OLYMPUS", "E-1", NeutralFluorescent, -5, { 1.937500, 1, 1.234375, 0 } },
/*4500K*/
@@ -2017,21 +1972,21 @@
{ "OLYMPUS", "E-1", NeutralFluorescent, 5, { 1.695312, 1, 1.437500, 0 } },
/*4500K*/
{ "OLYMPUS", "E-1", NeutralFluorescent, 6, { 1.656250, 1, 1.476562, 0 } },
/*4500K*/
{ "OLYMPUS", "E-1", NeutralFluorescent, 7, { 1.617188, 1, 1.515625, 0 } },
/*4500K*/
- { "OLYMPUS", "E-1", "4800K", -7, { 1.601562, 1, 1.179688, 0 } },
- { "OLYMPUS", "E-1", "4800K", -6, { 1.593750, 1, 1.187500, 0 } },
- { "OLYMPUS", "E-1", "4800K", -5, { 1.585938, 1, 1.195312, 0 } },
- { "OLYMPUS", "E-1", "4800K", -4, { 1.578125, 1, 1.203125, 0 } },
- { "OLYMPUS", "E-1", "4800K", -3, { 1.562500, 1, 1.203125, 0 } },
- { "OLYMPUS", "E-1", "4800K", -2, { 1.554688, 1, 1.210938, 0 } },
- { "OLYMPUS", "E-1", "4800K", -1, { 1.546875, 1, 1.218750, 0 } },
- { "OLYMPUS", "E-1", "4800K", 0, { 1.546875, 1, 1.226562, 0 } },
- { "OLYMPUS", "E-1", "4800K", 1, { 1.531250, 1, 1.234375, 0 } },
- { "OLYMPUS", "E-1", "4800K", 2, { 1.515625, 1, 1.242188, 0 } },
- { "OLYMPUS", "E-1", "4800K", 3, { 1.507812, 1, 1.257812, 0 } },
- { "OLYMPUS", "E-1", "4800K", 4, { 1.500000, 1, 1.265625, 0 } },
- { "OLYMPUS", "E-1", "4800K", 5, { 1.484375, 1, 1.273438, 0 } },
- { "OLYMPUS", "E-1", "4800K", 6, { 1.476562, 1, 1.281250, 0 } },
- { "OLYMPUS", "E-1", "4800K", 7, { 1.460938, 1, 1.289062, 0 } },
+ { "OLYMPUS", "E-1", DaylightFluorescent, -7, { 2.819820, 1.153153, 1, 0 } },
/*6600K*/
+ { "OLYMPUS", "E-1", DaylightFluorescent, -6, { 2.669565, 1.113043, 1, 0 } },
/*6600K*/
+ { "OLYMPUS", "E-1", DaylightFluorescent, -5, { 2.521008, 1.075630, 1, 0 } },
/*6600K*/
+ { "OLYMPUS", "E-1", DaylightFluorescent, -4, { 2.390244, 1.040650, 1, 0 } },
/*6600K*/
+ { "OLYMPUS", "E-1", DaylightFluorescent, -3, { 2.259843, 1.007874, 1, 0 } },
/*6600K*/
+ { "OLYMPUS", "E-1", DaylightFluorescent, -2, { 2.195312, 1, 1.023438, 0 } },
/*6600K*/
+ { "OLYMPUS", "E-1", DaylightFluorescent, -1, { 2.140625, 1, 1.054688, 0 } },
/*6600K*/
+ { "OLYMPUS", "E-1", DaylightFluorescent, 0, { 2.101562, 1, 1.085938, 0 } },
/*6600K*/
+ { "OLYMPUS", "E-1", DaylightFluorescent, 1, { 2.070312, 1, 1.101562, 0 } },
/*6600K*/
+ { "OLYMPUS", "E-1", DaylightFluorescent, 2, { 2.046875, 1, 1.117188, 0 } },
/*6600K*/
+ { "OLYMPUS", "E-1", DaylightFluorescent, 3, { 2.023438, 1, 1.132812, 0 } },
/*6600K*/
+ { "OLYMPUS", "E-1", DaylightFluorescent, 4, { 2.000000, 1, 1.156250, 0 } },
/*6600K*/
+ { "OLYMPUS", "E-1", DaylightFluorescent, 5, { 1.976562, 1, 1.171875, 0 } },
/*6600K*/
+ { "OLYMPUS", "E-1", DaylightFluorescent, 6, { 1.953125, 1, 1.187500, 0 } },
/*6600K*/
+ { "OLYMPUS", "E-1", DaylightFluorescent, 7, { 1.929688, 1, 1.203125, 0 } },
/*6600K*/
{ "OLYMPUS", "E-1", Daylight, -7, { 1.726562, 1, 1.093750, 0 } },
/*5300K*/
{ "OLYMPUS", "E-1", Daylight, -6, { 1.710938, 1, 1.101562, 0 } },
/*5300K*/
{ "OLYMPUS", "E-1", Daylight, -5, { 1.703125, 1, 1.109375, 0 } },
/*5300K*/
@@ -2050,7 +2005,7 @@
{ "OLYMPUS", "E-1", Cloudy, -7, { 2.008130, 1.040650, 1, 0 } },
/*6000K*/
{ "OLYMPUS", "E-1", Cloudy, -6, { 1.967742, 1.032258, 1, 0 } },
/*6000K*/
{ "OLYMPUS", "E-1", Cloudy, -5, { 1.920635, 1.015873, 1, 0 } },
/*6000K*/
- { "OLYMPUS", "E-1", Cloudy, -4, { 1.867188, 1, 1, 0 } },
/*6000K*/
+ { "OLYMPUS", "E-1", Cloudy, -4, { 1.867188, 1, 1.000000, 0 } },
/*6000K*/
{ "OLYMPUS", "E-1", Cloudy, -3, { 1.851562, 1, 1.007812, 0 } },
/*6000K*/
{ "OLYMPUS", "E-1", Cloudy, -2, { 1.828125, 1, 1.023438, 0 } },
/*6000K*/
{ "OLYMPUS", "E-1", Cloudy, -1, { 1.812500, 1, 1.031250, 0 } },
/*6000K*/
@@ -2062,21 +2017,6 @@
{ "OLYMPUS", "E-1", Cloudy, 5, { 1.742188, 1, 1.078125, 0 } },
/*6000K*/
{ "OLYMPUS", "E-1", Cloudy, 6, { 1.734375, 1, 1.085938, 0 } },
/*6000K*/
{ "OLYMPUS", "E-1", Cloudy, 7, { 1.726562, 1, 1.093750, 0 } },
/*6000K*/
- { "OLYMPUS", "E-1", DaylightFluorescent, -7, { 2.819820, 1.153153, 1, 0 } },
/*6600K*/
- { "OLYMPUS", "E-1", DaylightFluorescent, -6, { 2.669565, 1.113043, 1, 0 } },
/*6600K*/
- { "OLYMPUS", "E-1", DaylightFluorescent, -5, { 2.521008, 1.075630, 1, 0 } },
/*6600K*/
- { "OLYMPUS", "E-1", DaylightFluorescent, -4, { 2.390244, 1.040650, 1, 0 } },
/*6600K*/
- { "OLYMPUS", "E-1", DaylightFluorescent, -3, { 2.259843, 1.007874, 1, 0 } },
/*6600K*/
- { "OLYMPUS", "E-1", DaylightFluorescent, -2, { 2.195312, 1, 1.023438, 0 } },
/*6600K*/
- { "OLYMPUS", "E-1", DaylightFluorescent, -1, { 2.140625, 1, 1.054688, 0 } },
/*6600K*/
- { "OLYMPUS", "E-1", DaylightFluorescent, 0, { 2.101562, 1, 1.085938, 0 } },
/*6600K*/
- { "OLYMPUS", "E-1", DaylightFluorescent, 1, { 2.070312, 1, 1.101562, 0 } },
/*6600K*/
- { "OLYMPUS", "E-1", DaylightFluorescent, 2, { 2.046875, 1, 1.117188, 0 } },
/*6600K*/
- { "OLYMPUS", "E-1", DaylightFluorescent, 3, { 2.023438, 1, 1.132812, 0 } },
/*6600K*/
- { "OLYMPUS", "E-1", DaylightFluorescent, 4, { 2.000000, 1, 1.156250, 0 } },
/*6600K*/
- { "OLYMPUS", "E-1", DaylightFluorescent, 5, { 1.976562, 1, 1.171875, 0 } },
/*6600K*/
- { "OLYMPUS", "E-1", DaylightFluorescent, 6, { 1.953125, 1, 1.187500, 0 } },
/*6600K*/
- { "OLYMPUS", "E-1", DaylightFluorescent, 7, { 1.929688, 1, 1.203125, 0 } },
/*6600K*/
{ "OLYMPUS", "E-1", Shade, -7, { 2.584906, 1.207547, 1, 0 } },
/*7500K*/
{ "OLYMPUS", "E-1", Shade, -6, { 2.532710, 1.196262, 1, 0 } },
/*7500K*/
{ "OLYMPUS", "E-1", Shade, -5, { 2.467890, 1.174312, 1, 0 } },
/*7500K*/
@@ -2091,7 +2031,67 @@
{ "OLYMPUS", "E-1", Shade, 4, { 2.000000, 1.040650,
1, 0 } }, /*7500K*/
{ "OLYMPUS", "E-1", Shade, 5, { 1.944000, 1.024000,
1, 0 } }, /*7500K*/
{ "OLYMPUS", "E-1", Shade, 6, { 1.897638, 1.007874,
1, 0 } }, /*7500K*/
- { "OLYMPUS", "E-1", Shade, 7, { 1.859375, 1, 1, 0 }
}, /*7500K*/
+ { "OLYMPUS", "E-1", Shade, 7, { 1.859375, 1,
1.000000, 0 } }, /*7500K*/
+ { "OLYMPUS", "E-1", "3300K", -7, { 1.109375, 1, 1.695312, 0 } },
+ { "OLYMPUS", "E-1", "3300K", -6, { 1.101562, 1, 1.710938, 0 } },
+ { "OLYMPUS", "E-1", "3300K", -5, { 1.093750, 1, 1.718750, 0 } },
+ { "OLYMPUS", "E-1", "3300K", -4, { 1.093750, 1, 1.734375, 0 } },
+ { "OLYMPUS", "E-1", "3300K", -3, { 1.085938, 1, 1.742188, 0 } },
+ { "OLYMPUS", "E-1", "3300K", -2, { 1.078125, 1, 1.750000, 0 } },
+ { "OLYMPUS", "E-1", "3300K", -1, { 1.070312, 1, 1.765625, 0 } },
+ { "OLYMPUS", "E-1", "3300K", 0, { 1.070312, 1, 1.773438, 0 } },
+ { "OLYMPUS", "E-1", "3300K", 1, { 1.054688, 1, 1.781250, 0 } },
+ { "OLYMPUS", "E-1", "3300K", 2, { 1.046875, 1, 1.796875, 0 } },
+ { "OLYMPUS", "E-1", "3300K", 3, { 1.046875, 1, 1.804688, 0 } },
+ { "OLYMPUS", "E-1", "3300K", 4, { 1.039062, 1, 1.820312, 0 } },
+ { "OLYMPUS", "E-1", "3300K", 5, { 1.031250, 1, 1.828125, 0 } },
+ { "OLYMPUS", "E-1", "3300K", 6, { 1.023438, 1, 1.843750, 0 } },
+ { "OLYMPUS", "E-1", "3300K", 7, { 1.015625, 1, 1.851562, 0 } },
+ { "OLYMPUS", "E-1", "3900K", -7, { 1.335938, 1, 1.414062, 0 } },
+ { "OLYMPUS", "E-1", "3900K", -6, { 1.320312, 1, 1.429688, 0 } },
+ { "OLYMPUS", "E-1", "3900K", -5, { 1.304688, 1, 1.445312, 0 } },
+ { "OLYMPUS", "E-1", "3900K", -4, { 1.289062, 1, 1.460938, 0 } },
+ { "OLYMPUS", "E-1", "3900K", -3, { 1.273438, 1, 1.476562, 0 } },
+ { "OLYMPUS", "E-1", "3900K", -2, { 1.257812, 1, 1.492188, 0 } },
+ { "OLYMPUS", "E-1", "3900K", -1, { 1.242188, 1, 1.507812, 0 } },
+ { "OLYMPUS", "E-1", "3900K", 0, { 1.234375, 1, 1.523438, 0 } },
+ { "OLYMPUS", "E-1", "3900K", 1, { 1.218750, 1, 1.531250, 0 } },
+ { "OLYMPUS", "E-1", "3900K", 2, { 1.210938, 1, 1.546875, 0 } },
+ { "OLYMPUS", "E-1", "3900K", 3, { 1.203125, 1, 1.554688, 0 } },
+ { "OLYMPUS", "E-1", "3900K", 4, { 1.195312, 1, 1.562500, 0 } },
+ { "OLYMPUS", "E-1", "3900K", 5, { 1.187500, 1, 1.578125, 0 } },
+ { "OLYMPUS", "E-1", "3900K", 6, { 1.187500, 1, 1.585938, 0 } },
+ { "OLYMPUS", "E-1", "3900K", 7, { 1.179688, 1, 1.601562, 0 } },
+ { "OLYMPUS", "E-1", "4300K", -7, { 1.484375, 1, 1.281250, 0 } },
+ { "OLYMPUS", "E-1", "4300K", -6, { 1.468750, 1, 1.289062, 0 } },
+ { "OLYMPUS", "E-1", "4300K", -5, { 1.460938, 1, 1.296875, 0 } },
+ { "OLYMPUS", "E-1", "4300K", -4, { 1.445312, 1, 1.304688, 0 } },
+ { "OLYMPUS", "E-1", "4300K", -3, { 1.437500, 1, 1.312500, 0 } },
+ { "OLYMPUS", "E-1", "4300K", -2, { 1.429688, 1, 1.328125, 0 } },
+ { "OLYMPUS", "E-1", "4300K", -1, { 1.414062, 1, 1.335938, 0 } },
+ { "OLYMPUS", "E-1", "4300K", 0, { 1.414062, 1, 1.343750, 0 } },
+ { "OLYMPUS", "E-1", "4300K", 1, { 1.390625, 1, 1.359375, 0 } },
+ { "OLYMPUS", "E-1", "4300K", 2, { 1.375000, 1, 1.375000, 0 } },
+ { "OLYMPUS", "E-1", "4300K", 3, { 1.359375, 1, 1.390625, 0 } },
+ { "OLYMPUS", "E-1", "4300K", 4, { 1.343750, 1, 1.406250, 0 } },
+ { "OLYMPUS", "E-1", "4300K", 5, { 1.328125, 1, 1.421875, 0 } },
+ { "OLYMPUS", "E-1", "4300K", 6, { 1.312500, 1, 1.437500, 0 } },
+ { "OLYMPUS", "E-1", "4300K", 7, { 1.296875, 1, 1.453125, 0 } },
+ { "OLYMPUS", "E-1", "4800K", -7, { 1.601562, 1, 1.179688, 0 } },
+ { "OLYMPUS", "E-1", "4800K", -6, { 1.593750, 1, 1.187500, 0 } },
+ { "OLYMPUS", "E-1", "4800K", -5, { 1.585938, 1, 1.195312, 0 } },
+ { "OLYMPUS", "E-1", "4800K", -4, { 1.578125, 1, 1.203125, 0 } },
+ { "OLYMPUS", "E-1", "4800K", -3, { 1.562500, 1, 1.203125, 0 } },
+ { "OLYMPUS", "E-1", "4800K", -2, { 1.554688, 1, 1.210938, 0 } },
+ { "OLYMPUS", "E-1", "4800K", -1, { 1.546875, 1, 1.218750, 0 } },
+ { "OLYMPUS", "E-1", "4800K", 0, { 1.546875, 1, 1.226562, 0 } },
+ { "OLYMPUS", "E-1", "4800K", 1, { 1.531250, 1, 1.234375, 0 } },
+ { "OLYMPUS", "E-1", "4800K", 2, { 1.515625, 1, 1.242188, 0 } },
+ { "OLYMPUS", "E-1", "4800K", 3, { 1.507812, 1, 1.257812, 0 } },
+ { "OLYMPUS", "E-1", "4800K", 4, { 1.500000, 1, 1.265625, 0 } },
+ { "OLYMPUS", "E-1", "4800K", 5, { 1.484375, 1, 1.273438, 0 } },
+ { "OLYMPUS", "E-1", "4800K", 6, { 1.476562, 1, 1.281250, 0 } },
+ { "OLYMPUS", "E-1", "4800K", 7, { 1.460938, 1, 1.289062, 0 } },
{ "OLYMPUS", "E-10", Incandescent, 0, { 1, 1.153153,
3.441442, 0 } }, /*3000K*/
{ "OLYMPUS", "E-10", IncandescentWarm, 0, { 1.101562, 1, 2.351562, 0 } },
/*3700K*/
@@ -2104,8 +2104,8 @@
{ "OLYMPUS", "E-3", Daylight, 0, { 2.007813, 1, 1.390625, 0 } },
{ "OLYMPUS", "E-3", Shade, 0, { 2.421875, 1,
1.085937, 0 } },
{ "OLYMPUS", "E-3", Cloudy, 0, { 2.218750, 1, 1.257812, 0 } },
- { "OLYMPUS", "E-3", Tungsten, 0, { 1.156250, 1, 2.679687, 0 } },
- { "OLYMPUS", "E-3", Fluorescent, 0, { 1.828125, 1, 2.078125, 0 } },
+ { "OLYMPUS", "E-3", Incandescent, 0, { 1.156250, 1, 2.679687, 0 } },
+ { "OLYMPUS", "E-3", WhiteFluorescent, 0, { 1.828125, 1, 2.078125, 0 } },
{ "OLYMPUS", "E-3", NeutralFluorescent, 0, { 1.867188, 1, 1.679688, 0 } },
{ "OLYMPUS", "E-3", DaylightFluorescent, 0, { 2.195313, 1, 1.406250, 0 } },
{ "OLYMPUS", "E-3", Flash, 0, { 2.210937, 1,
1.265625, 0 } },
@@ -2178,9 +2178,9 @@
{ "OLYMPUS", "E-30", Incandescent, -7, { 1, 1.103448, 3.137931, 0 } },
{ "OLYMPUS", "E-30", Incandescent, 0, { 1.054687, 1,
2.500000, 0 } },
{ "OLYMPUS", "E-30", Incandescent, 7, { 1.195313, 1,
2.148437, 0 } },
- { "OLYMPUS", "E-30", Fluorescent, -7, { 1.453125, 1,
2.187500, 0 } },
- { "OLYMPUS", "E-30", Fluorescent, 0, { 1.695313, 1, 1.921875, 0 } },
- { "OLYMPUS", "E-30", Fluorescent, 7, { 1.929687, 1, 1.648437, 0 } },
+ { "OLYMPUS", "E-30", WhiteFluorescent, -7, { 1.453125, 1, 2.187500, 0 } },
+ { "OLYMPUS", "E-30", WhiteFluorescent, 0, { 1.695313, 1, 1.921875, 0 } },
+ { "OLYMPUS", "E-30", WhiteFluorescent, 7, { 1.929687, 1, 1.648437, 0 } },
{ "OLYMPUS", "E-30", NeutralFluorescent, -7, { 1.437500, 1, 1.929687, 0 } },
{ "OLYMPUS", "E-30", NeutralFluorescent, 0, { 1.679687, 1, 1.695313, 0 } },
{ "OLYMPUS", "E-30", NeutralFluorescent, 7, { 1.914063, 1, 1.453125, 0 } },
@@ -2355,7 +2355,7 @@
{ "OLYMPUS", "E-520", Shade, 0, { 2.234375, 1, 1.140625, 0 } },
{ "OLYMPUS", "E-520", Cloudy, 0, { 2.046875, 1, 1.296875, 0 } },
{ "OLYMPUS", "E-520", Tungsten, 0, { 1.062500, 1, 2.687500, 0 } },
- { "OLYMPUS", "E-520", Fluorescent, 0, { 1.703125, 1,
2.109375, 0 } },
+ { "OLYMPUS", "E-520", WhiteFluorescent, 0, { 1.703125, 1, 2.109375, 0 } },
{ "OLYMPUS", "E-520", NeutralFluorescent, 0, { 1.718750, 1, 1.765625, 0 } },
{ "OLYMPUS", "E-520", DaylightFluorescent, 0, { 2.101563, 1,
1.375000, 0 } },
{ "OLYMPUS", "E-520", Flash, 0, { 2.039063, 1, 1.296875, 0 } },
@@ -2429,9 +2429,9 @@
{ "OLYMPUS", "E-620", Incandescent, -7, { 1.070312, 1, 3.281250, 0 } },
{ "OLYMPUS", "E-620", Incandescent, 0, { 1.101563, 1, 2.531250, 0 } },
{ "OLYMPUS", "E-620", Incandescent, 7, { 1.070313, 1, 1.867188, 0 } },
- { "OLYMPUS", "E-620", Fluorescent, -7, { 1.679687, 1, 2.500000, 0 } },
- { "OLYMPUS", "E-620", Fluorescent, 0, { 1.718750, 1,
1.929687, 0 } },
- { "OLYMPUS", "E-620", Fluorescent, 7, { 1.679688, 1,
1.421875, 0 } },
+ { "OLYMPUS", "E-620", WhiteFluorescent, -7, { 1.679687, 1, 2.500000, 0 } },
+ { "OLYMPUS", "E-620", WhiteFluorescent, 0, { 1.718750, 1, 1.929687, 0 } },
+ { "OLYMPUS", "E-620", WhiteFluorescent, 7, { 1.679688, 1, 1.421875, 0 } },
{ "OLYMPUS", "E-620", NeutralFluorescent, -7, { 1.632813, 1,
2.179688, 0 } },
{ "OLYMPUS", "E-620", NeutralFluorescent, 0, { 1.671875, 1, 1.679688, 0 } },
{ "OLYMPUS", "E-620", NeutralFluorescent, 7, { 1.625000, 1, 1.234375, 0 } },
------------------------------------------------------------------------------
This SF.Net email is sponsored by the Verizon Developer Community
Take advantage of Verizon's best-in-class app development support
A streamlined, 14 day to market process makes app distribution fast and easy
Join now and get one step closer to millions of Verizon customers
http://p.sf.net/sfu/verizon-dev2dev
_______________________________________________
ufraw-cvs mailing list
ufraw-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs
