[UFRaw-CVS] ufraw wb_presets.c,1.3,1.4

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Update of /cvsroot/ufraw/ufraw
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26341

Modified Files:
	wb_presets.c 
Log Message:
Add all WB fine tuning values for the Olympus E-1

Index: wb_presets.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/wb_presets.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** wb_presets.c	22 Feb 2006 10:46:43 -0000	1.3
--- wb_presets.c	24 Feb 2006 13:39:37 -0000	1.4
***************
*** 340,377 ****
--- 340,521 ----
  
    { "OLYMPUS", "E-1", "3000K Tungsten", -7,	{ 1.015625, 1, 1.867188, 0 } },
+   { "OLYMPUS", "E-1", "3000K Tungsten", -6,     { 1.007812, 1, 1.875000, 0 } },
+   { "OLYMPUS", "E-1", "3000K Tungsten", -5,     { 1, 1, 1.890625, 0 } },
+   { "OLYMPUS", "E-1", "3000K Tungsten", -4,     { 1, 1.007874, 1.913386, 0 } },
+   { "OLYMPUS", "E-1", "3000K Tungsten", -3,     { 1, 1.015873, 1.944444, 0 } },
+   { "OLYMPUS", "E-1", "3000K Tungsten", -2,     { 1, 1.015873, 1.952381, 0 } },
+   { "OLYMPUS", "E-1", "3000K Tungsten", -1,     { 1, 1.024000, 1.984000, 0 } },
    { "OLYMPUS", "E-1", "3000K Tungsten", 0,	{ 1, 1.024000, 1.992000, 0 } },
+   { "OLYMPUS", "E-1", "3000K Tungsten", 1,      { 1, 1.032258, 2.008065, 0 } },
+   { "OLYMPUS", "E-1", "3000K Tungsten", 2,      { 1, 1.040650, 2.040650, 0 } },
+   { "OLYMPUS", "E-1", "3000K Tungsten", 3,      { 1, 1.040650, 2.048780, 0 } },
+   { "OLYMPUS", "E-1", "3000K Tungsten", 4,      { 1, 1.049180, 2.081967, 0 } },
+   { "OLYMPUS", "E-1", "3000K Tungsten", 5,      { 1, 1.057851, 2.107438, 0 } },
+   { "OLYMPUS", "E-1", "3000K Tungsten", 6,      { 1, 1.066667, 2.141667, 0 } },
    { "OLYMPUS", "E-1", "3000K Tungsten", 7,	{ 1, 1.075630, 2.168067, 0 } },
    { "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", "3600K Incandescent", -7, { 1.195312, 1, 1.562500, 0 } },
+   { "OLYMPUS", "E-1", "3600K Incandescent", -6, { 1.187500, 1, 1.578125, 0 } },
+   { "OLYMPUS", "E-1", "3600K Incandescent", -5, { 1.187500, 1, 1.585938, 0 } },
+   { "OLYMPUS", "E-1", "3600K Incandescent", -4, { 1.179688, 1, 1.601562, 0 } },
+   { "OLYMPUS", "E-1", "3600K Incandescent", -3, { 1.171875, 1, 1.609375, 0 } },
+   { "OLYMPUS", "E-1", "3600K Incandescent", -2, { 1.164062, 1, 1.617188, 0 } },
+   { "OLYMPUS", "E-1", "3600K Incandescent", -1, { 1.156250, 1, 1.632812, 0 } },
    { "OLYMPUS", "E-1", "3600K Incandescent", 0,  { 1.156250, 1, 1.640625, 0 } },
+   { "OLYMPUS", "E-1", "3600K Incandescent", 1,  { 1.140625, 1, 1.648438, 0 } },
+   { "OLYMPUS", "E-1", "3600K Incandescent", 2,  { 1.132812, 1, 1.664062, 0 } },
+   { "OLYMPUS", "E-1", "3600K Incandescent", 3,  { 1.125000, 1, 1.671875, 0 } },
+   { "OLYMPUS", "E-1", "3600K Incandescent", 4,  { 1.117188, 1, 1.679688, 0 } },
+   { "OLYMPUS", "E-1", "3600K Incandescent", 5,  { 1.117188, 1, 1.695312, 0 } },
+   { "OLYMPUS", "E-1", "3600K Incandescent", 6,  { 1.109375, 1, 1.703125, 0 } },
    { "OLYMPUS", "E-1", "3600K Incandescent", 7,  { 1.101562, 1, 1.718750, 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", "4000K White fluorescent", -7, { 2.296875, 1, 1.445312, 0 } },
+   { "OLYMPUS", "E-1", "4000K White fluorescent", -6, { 2.273438, 1, 1.468750, 0 } },
+   { "OLYMPUS", "E-1", "4000K White fluorescent", -5, { 2.242188, 1, 1.492188, 0 } },
+   { "OLYMPUS", "E-1", "4000K White fluorescent", -4, { 2.210938, 1, 1.523438, 0 } },
+   { "OLYMPUS", "E-1", "4000K White fluorescent", -3, { 2.171875, 1, 1.562500, 0 } },
+   { "OLYMPUS", "E-1", "4000K White fluorescent", -2, { 2.132812, 1, 1.601562, 0 } },
+   { "OLYMPUS", "E-1", "4000K White fluorescent", -1, { 2.093750, 1, 1.640625, 0 } },
    { "OLYMPUS", "E-1", "4000K White fluorescent", 0,  { 2.062500, 1, 1.679688, 0 } },
+   { "OLYMPUS", "E-1", "4000K White fluorescent", 1,  { 2.039062, 1, 1.703125, 0 } },
+   { "OLYMPUS", "E-1", "4000K White fluorescent", 2,  { 2.015625, 1, 1.734375, 0 } },
+   { "OLYMPUS", "E-1", "4000K White fluorescent", 3,  { 2.000000, 1, 1.757812, 0 } },
+   { "OLYMPUS", "E-1", "4000K White fluorescent", 4,  { 1.984375, 1, 1.789062, 0 } },
+   { "OLYMPUS", "E-1", "4000K White fluorescent", 5,  { 1.968750, 1, 1.812500, 0 } },
+   { "OLYMPUS", "E-1", "4000K White fluorescent", 6,  { 1.945312, 1, 1.835938, 0 } },
    { "OLYMPUS", "E-1", "4000K White fluorescent", 7,  { 1.929688, 1, 1.867188, 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", "4500K Neutral fluorescent", -7, { 1.984375, 1, 1.203125, 0 } },
+   { "OLYMPUS", "E-1", "4500K Neutral fluorescent", -6, { 1.960938, 1, 1.218750, 0 } },
+   { "OLYMPUS", "E-1", "4500K Neutral fluorescent", -5, { 1.937500, 1, 1.234375, 0 } },
+   { "OLYMPUS", "E-1", "4500K Neutral fluorescent", -4, { 1.921875, 1, 1.257812, 0 } },
+   { "OLYMPUS", "E-1", "4500K Neutral fluorescent", -3, { 1.898438, 1, 1.273438, 0 } },
+   { "OLYMPUS", "E-1", "4500K Neutral fluorescent", -2, { 1.875000, 1, 1.289062, 0 } },
+   { "OLYMPUS", "E-1", "4500K Neutral fluorescent", -1, { 1.851562, 1, 1.304688, 0 } },
    { "OLYMPUS", "E-1", "4500K Neutral fluorescent", 0,  { 1.835938, 1, 1.320312, 0 } },
+   { "OLYMPUS", "E-1", "4500K Neutral fluorescent", 1,  { 1.804688, 1, 1.343750, 0 } },
+   { "OLYMPUS", "E-1", "4500K Neutral fluorescent", 2,  { 1.773438, 1, 1.367188, 0 } },
+   { "OLYMPUS", "E-1", "4500K Neutral fluorescent", 3,  { 1.750000, 1, 1.390625, 0 } },
+   { "OLYMPUS", "E-1", "4500K Neutral fluorescent", 4,  { 1.718750, 1, 1.414062, 0 } },
+   { "OLYMPUS", "E-1", "4500K Neutral fluorescent", 5,  { 1.695312, 1, 1.437500, 0 } },
+   { "OLYMPUS", "E-1", "4500K Neutral fluorescent", 6,  { 1.656250, 1, 1.476562, 0 } },
    { "OLYMPUS", "E-1", "4500K Neutral fluorescent", 7,  { 1.617188, 1, 1.515625, 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-1", "5300K Clear day", -7,	{ 1.726562, 1, 1.093750, 0 } },
+   { "OLYMPUS", "E-1", "5300K Clear day", -6,    { 1.710938, 1, 1.101562, 0 } },
+   { "OLYMPUS", "E-1", "5300K Clear day", -5,    { 1.703125, 1, 1.109375, 0 } },
+   { "OLYMPUS", "E-1", "5300K Clear day", -4,    { 1.695312, 1, 1.117188, 0 } },
+   { "OLYMPUS", "E-1", "5300K Clear day", -3,    { 1.687500, 1, 1.117188, 0 } },
+   { "OLYMPUS", "E-1", "5300K Clear day", -2,    { 1.671875, 1, 1.125000, 0 } },
+   { "OLYMPUS", "E-1", "5300K Clear day", -1,    { 1.664062, 1, 1.132812, 0 } },
    { "OLYMPUS", "E-1", "5300K Clear day", 0,	{ 1.664062, 1, 1.140625, 0 } },
+   { "OLYMPUS", "E-1", "5300K Clear day", 1,     { 1.648438, 1, 1.148438, 0 } },
+   { "OLYMPUS", "E-1", "5300K Clear day", 2,     { 1.640625, 1, 1.156250, 0 } },
+   { "OLYMPUS", "E-1", "5300K Clear day", 3,     { 1.632812, 1, 1.164062, 0 } },
+   { "OLYMPUS", "E-1", "5300K Clear day", 4,     { 1.617188, 1, 1.164062, 0 } },
+   { "OLYMPUS", "E-1", "5300K Clear day", 5,     { 1.609375, 1, 1.171875, 0 } },
+   { "OLYMPUS", "E-1", "5300K Clear day", 6,     { 1.601562, 1, 1.179688, 0 } },
    { "OLYMPUS", "E-1", "5300K Clear day", 7,	{ 1.593750, 1, 1.187500, 0 } },
    { "OLYMPUS", "E-1", "6000K Cloudy (with flash)", -7, { 2.008130, 1.040650, 1, 0 } },
+   { "OLYMPUS", "E-1", "6000K Cloudy (with flash)", -6, { 1.967742, 1.032258, 1, 0 } },
+   { "OLYMPUS", "E-1", "6000K Cloudy (with flash)", -5, { 1.920635, 1.015873, 1, 0 } },
+   { "OLYMPUS", "E-1", "6000K Cloudy (with flash)", -4, { 1.867188, 1, 1, 0 } },
+   { "OLYMPUS", "E-1", "6000K Cloudy (with flash)", -3, { 1.851562, 1, 1.007812, 0 } },
+   { "OLYMPUS", "E-1", "6000K Cloudy (with flash)", -2, { 1.828125, 1, 1.023438, 0 } },
+   { "OLYMPUS", "E-1", "6000K Cloudy (with flash)", -1, { 1.812500, 1, 1.031250, 0 } },
    { "OLYMPUS", "E-1", "6000K Cloudy (with flash)", 0,  { 1.796875, 1, 1.046875, 0 } },
+   { "OLYMPUS", "E-1", "6000K Cloudy (with flash)", 1,  { 1.781250, 1, 1.054688, 0 } },
+   { "OLYMPUS", "E-1", "6000K Cloudy (with flash)", 2,  { 1.773438, 1, 1.062500, 0 } },
+   { "OLYMPUS", "E-1", "6000K Cloudy (with flash)", 3,  { 1.757812, 1, 1.070312, 0 } },
+   { "OLYMPUS", "E-1", "6000K Cloudy (with flash)", 4,  { 1.750000, 1, 1.070312, 0 } },
+   { "OLYMPUS", "E-1", "6000K Cloudy (with flash)", 5,  { 1.742188, 1, 1.078125, 0 } },
+   { "OLYMPUS", "E-1", "6000K Cloudy (with flash)", 6,  { 1.734375, 1, 1.085938, 0 } },
    { "OLYMPUS", "E-1", "6000K Cloudy (with flash)", 7,  { 1.726562, 1, 1.093750, 0 } },
    { "OLYMPUS", "E-1", "6600K Daylight fluorescent", -7, { 2.819820, 1.153153, 1, 0 } },
+   { "OLYMPUS", "E-1", "6600K Daylight fluorescent", -6, { 2.669565, 1.113043, 1, 0 } },
+   { "OLYMPUS", "E-1", "6600K Daylight fluorescent", -5, { 2.521008, 1.075630, 1, 0 } },
+   { "OLYMPUS", "E-1", "6600K Daylight fluorescent", -4, { 2.390244, 1.040650, 1, 0 } },
+   { "OLYMPUS", "E-1", "6600K Daylight fluorescent", -3, { 2.259843, 1.007874, 1, 0 } },
+   { "OLYMPUS", "E-1", "6600K Daylight fluorescent", -2, { 2.195312, 1, 1.023438, 0 } },
+   { "OLYMPUS", "E-1", "6600K Daylight fluorescent", -1, { 2.140625, 1, 1.054688, 0 } },
    { "OLYMPUS", "E-1", "6600K Daylight fluorescent", 0,  { 2.101562, 1, 1.085938, 0 } },
+   { "OLYMPUS", "E-1", "6600K Daylight fluorescent", 1,  { 2.070312, 1, 1.101562, 0 } },
+   { "OLYMPUS", "E-1", "6600K Daylight fluorescent", 2,  { 2.046875, 1, 1.117188, 0 } },
+   { "OLYMPUS", "E-1", "6600K Daylight fluorescent", 3,  { 2.023438, 1, 1.132812, 0 } },
+   { "OLYMPUS", "E-1", "6600K Daylight fluorescent", 4,  { 2.000000, 1, 1.156250, 0 } },
+   { "OLYMPUS", "E-1", "6600K Daylight fluorescent", 5,  { 1.976562, 1, 1.171875, 0 } },
+   { "OLYMPUS", "E-1", "6600K Daylight fluorescent", 6,  { 1.953125, 1, 1.187500, 0 } },
    { "OLYMPUS", "E-1", "6600K Daylight fluorescent", 7,  { 1.929688, 1, 1.203125, 0 } },
    { "OLYMPUS", "E-1", "7500K Shadows", -7,	{ 2.584906, 1.207547, 1, 0 } },
+   { "OLYMPUS", "E-1", "7500K Shadows", -6,      { 2.532710, 1.196262, 1, 0 } },
+   { "OLYMPUS", "E-1", "7500K Shadows", -5,      { 2.467890, 1.174312, 1, 0 } },
+   { "OLYMPUS", "E-1", "7500K Shadows", -4,      { 2.396396, 1.153153, 1, 0 } },
+   { "OLYMPUS", "E-1", "7500K Shadows", -3,      { 2.357143, 1.142857, 1, 0 } },
+   { "OLYMPUS", "E-1", "7500K Shadows", -2,      { 2.289474, 1.122807, 1, 0 } },
+   { "OLYMPUS", "E-1", "7500K Shadows", -1,      { 2.252174, 1.113043, 1, 0 } },
    { "OLYMPUS", "E-1", "7500K Shadows", 0,	{ 2.196581, 1.094017, 1, 0 } },
+   { "OLYMPUS", "E-1", "7500K Shadows", 1,       { 2.126050, 1.075630, 1, 0 } },
+   { "OLYMPUS", "E-1", "7500K Shadows", 2,       { 2.091667, 1.066667, 1, 0 } },
+   { "OLYMPUS", "E-1", "7500K Shadows", 3,       { 2.032787, 1.049180, 1, 0 } },
+   { "OLYMPUS", "E-1", "7500K Shadows", 4,       { 2.000000, 1.040650, 1, 0 } },
+   { "OLYMPUS", "E-1", "7500K Shadows", 5,       { 1.944000, 1.024000, 1, 0 } },
+   { "OLYMPUS", "E-1", "7500K Shadows", 6,       { 1.897638, 1.007874, 1, 0 } },
    { "OLYMPUS", "E-1", "7500K Shadows", 7,	{ 1.859375, 1, 1, 0 } },
  
***************
*** 401,402 ****
--- 545,547 ----
  
  const int wb_preset_count = sizeof(wb_preset) / sizeof(wb_data);
+