Update of /cvsroot/ufraw/ufraw
In directory vz-cvs-3.sog:/tmp/cvs-serv20366
Modified Files:
wb_presets.c
Log Message:
Add finetuning for the OLYMPUS E-M5 and more reasonable finetuning values for
the OLYMPUS E-PL1 and E-PL3 using only the amber-blue axis (like Nikon does).
Index: wb_presets.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/wb_presets.c,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -d -r1.213 -r1.214
--- wb_presets.c 23 May 2012 08:45:17 -0000 1.213
+++ wb_presets.c 24 May 2012 10:30:35 -0000 1.214
@@ -3616,13 +3616,28 @@
{ "OLYMPUS", "E-620", Flash, 0, { 2.039063, 1, 1.195313, 0 } },
{ "OLYMPUS", "E-620", Flash, 7, { 2.276786, 1.142857, 1, 0 } },
+ /* -7/+7 fine tuning is -7/+7 in amber-blue and zero in green-magenta */
+ { "OLYMPUS", "E-M5", Daylight, -7, { 1.8047, 1, 2.0547, 0 } },
{ "OLYMPUS", "E-M5", Daylight, 0, { 2.1016, 1, 1.8047, 0 } },
+ { "OLYMPUS", "E-M5", Daylight, 7, { 2.3906, 1, 1.5469, 0 } },
+ { "OLYMPUS", "E-M5", Shade, -7, { 2.1484, 1, 1.6172, 0 } },
{ "OLYMPUS", "E-M5", Shade, 0, { 2.5000, 1, 1.4219, 0 } },
+ { "OLYMPUS", "E-M5", Shade, 7, { 2.8437, 1, 1.2187, 0 } },
+ { "OLYMPUS", "E-M5", Cloudy, -7, { 1.9766, 1, 1.8516, 0 } },
{ "OLYMPUS", "E-M5", Cloudy, 0, { 2.3047, 1, 1.6250, 0 } },
+ { "OLYMPUS", "E-M5", Cloudy, 7, { 2.6250, 1, 1.3906, 0 } },
+ { "OLYMPUS", "E-M5", Incandescent, -7, { 1.1250, 1, 3.6953, 0 } },
{ "OLYMPUS", "E-M5", Incandescent, 0, { 1.3125, 1, 3.2422, 0
} },
+ { "OLYMPUS", "E-M5", Incandescent, 7, { 1.4922, 1, 2.7812, 0
} },
+ { "OLYMPUS", "E-M5", Fluorescent, -7, { 1.7344, 1, 2.9375, 0
} },
{ "OLYMPUS", "E-M5", Fluorescent, 0, { 2.0234, 1, 2.5781, 0 } },
+ { "OLYMPUS", "E-M5", Fluorescent, 7, { 2.3047, 1, 2.2109, 0 } },
+ { "OLYMPUS", "E-M5", Underwater, -7, { 1.3906, 1, 2.8281, 0 } },
{ "OLYMPUS", "E-M5", Underwater, 0, { 1.6250, 1, 2.4844, 0 } },
+ { "OLYMPUS", "E-M5", Underwater, 7, { 1.8516, 1, 2.1328, 0 } },
+ { "OLYMPUS", "E-M5", Flash, -7, { 2.0391, 1, 1.8203, 0 } },
{ "OLYMPUS", "E-M5", Flash, 0, { 2.3750, 1, 1.6016, 0 } },
+ { "OLYMPUS", "E-M5", Flash, 7, { 2.7031, 1, 1.3750, 0 } },
{ "OLYMPUS", "E-P1", Daylight, 0, { 1.835938, 1, 1.351563, 0 } },
{ "OLYMPUS", "E-P1", Shade, 0, { 2.195313, 1, 1.046875, 0 } },
@@ -3774,31 +3789,31 @@
{ "OLYMPUS", "E-P3", Flash, 7, { 2.1562, 1, 1.0078, 0 } },
/* Firmware version 1.2 */
- /* -7/+7 fine tuning is -7/+7 in both amber-blue and green-magenta */
- { "OLYMPUS", "E-PL1", Daylight, -7, { 1.687500, 1, 1.742187, 0 } },
+ /* -7/+7 fine tuning is -7/+7 in amber-blue and zero in green-magenta */
+ { "OLYMPUS", "E-PL1", Daylight, -7, { 1.492188, 1, 1.531250, 0 } },
{ "OLYMPUS", "E-PL1", Daylight, 0, { 1.726562, 1, 1.343750, 0 } },
- { "OLYMPUS", "E-PL1", Daylight, 7, { 1.706349, 1.015873, 1, 0 } },
- { "OLYMPUS", "E-PL1", Shade, -7, { 2.039063, 1, 1.343750, 0 } },
+ { "OLYMPUS", "E-PL1", Daylight, 7, { 1.984375, 1, 1.148438, 0 } },
+ { "OLYMPUS", "E-PL1", Shade, -7, { 1.796875, 1, 1.171875, 0 } },
{ "OLYMPUS", "E-PL1", Shade, 0, { 2.085937, 1, 1.039062, 0 } },
- { "OLYMPUS", "E-PL1", Shade, 7, { 2.663265, 1.306122, 1, 0 } },
- { "OLYMPUS", "E-PL1", Cloudy, -7, { 1.859375, 1, 1.562500, 0 } },
+ { "OLYMPUS", "E-PL1", Shade, 7, { 2.699115, 1.132743, 1, 0 } },
+ { "OLYMPUS", "E-PL1", Cloudy, -7, { 1.640625, 1, 1.367187, 0 } },
{ "OLYMPUS", "E-PL1", Cloudy, 0, { 1.906250, 1, 1.210938, 0 } },
- { "OLYMPUS", "E-PL1", Cloudy, 7, { 2.096491, 1.122807, 1, 0 } },
- { "OLYMPUS", "E-PL1", Incandescent, -7, { 1, 1.040650, 3.479675, 0 } },
+ { "OLYMPUS", "E-PL1", Cloudy, 7, { 2.179688, 1, 1.031250, 0 } },
+ { "OLYMPUS", "E-PL1", Incandescent, -7, { 1, 1.174312, 3.467890, 0 } },
{ "OLYMPUS", "E-PL1", Incandescent, 0, { 1, 1.015873, 2.619048, 0 } },
- { "OLYMPUS", "E-PL1", Incandescent, 7, { 1, 1.049180, 1.991803, 0 } },
- { "OLYMPUS", "E-PL1", WhiteFluorescent, -7, { 1.609375, 1, 2.546875, 0 } },
+ { "OLYMPUS", "E-PL1", Incandescent, 7, { 1.125000, 1, 2.226562, 0 } },
+ { "OLYMPUS", "E-PL1", WhiteFluorescent, -7, { 1.421875, 1, 2.234375, 0 } },
{ "OLYMPUS", "E-PL1", WhiteFluorescent, 0, { 1.648437, 1, 1.960937, 0 } },
- { "OLYMPUS", "E-PL1", WhiteFluorescent, 7, { 1.609375, 1, 1.437500, 0 } },
- { "OLYMPUS", "E-PL1", NeutralFluorescent, -7, { 1.570312, 1,
2.210937, 0 } },
+ { "OLYMPUS", "E-PL1", WhiteFluorescent, 7, { 1.882812, 1, 1.679687, 0 } },
+ { "OLYMPUS", "E-PL1", NeutralFluorescent, -7, { 1.390625, 1,
1.945313, 0 } },
{ "OLYMPUS", "E-PL1", NeutralFluorescent, 0, { 1.609375, 1, 1.710938, 0 } },
- { "OLYMPUS", "E-PL1", NeutralFluorescent, 7, { 1.570313, 1, 1.257813, 0 } },
- { "OLYMPUS", "E-PL1", DaylightFluorescent, -7, { 1.960937, 1, 1.718750, 0 }
},
+ { "OLYMPUS", "E-PL1", NeutralFluorescent, 7, { 1.851563, 1, 1.468750, 0 } },
+ { "OLYMPUS", "E-PL1", DaylightFluorescent, -7, { 1.750000, 1, 1.507812, 0 }
},
{ "OLYMPUS", "E-PL1", DaylightFluorescent, 0, { 2.015625, 1,
1.328125, 0 } },
- { "OLYMPUS", "E-PL1", DaylightFluorescent, 7, { 2.016000, 1.024000,
1, 0 } },
- { "OLYMPUS", "E-PL1", Flash, -7, { 1.851563, 1, 1.554688, 0 } },
+ { "OLYMPUS", "E-PL1", DaylightFluorescent, 7, { 2.320313, 1.140625,
1, 0 } },
+ { "OLYMPUS", "E-PL1", Flash, -7, { 1.640625, 1, 1.367187, 0 } },
{ "OLYMPUS", "E-PL1", Flash, 0, { 1.898438, 1, 1.203125, 0 } },
- { "OLYMPUS", "E-PL1", Flash, 7, { 2.106195, 1.132743, 1, 0 } },
+ { "OLYMPUS", "E-PL1", Flash, 7, { 2.179688, 1, 1.031250, 0 } },
{ "OLYMPUS", "E-PL1", "2000K", 0, { 1, 2.723404, 11.340426, 0 } },
{ "OLYMPUS", "E-PL1", "2050K", 0, { 1, 2.370370, 9.537037, 0 } },
{ "OLYMPUS", "E-PL1", "2100K", 0, { 1, 2.133333, 8.316667, 0 } },
@@ -3920,28 +3935,28 @@
{ "OLYMPUS", "E-PL2", "14000K", 0, { 2.5556, 1.2929, 1, 0 } },
/* Firmware version 1.3 */
- /* -7/+7 fine tuning is -7/+7 in both amber-blue and green-magenta */
- { "OLYMPUS", "E-PL3", Daylight, -7, { 1.929687, 1, 1.882812, 0 } },
+ /* -7/+7 fine tuning is -7/+7 in amber-blue and zero in green-magenta */
+ { "OLYMPUS", "E-PL3", Daylight, -7, { 1.695313, 1, 1.656250, 0 } },
{ "OLYMPUS", "E-PL3", Daylight, 0, { 1.976562, 1, 1.453125, 0 } },
- { "OLYMPUS", "E-PL3", Daylight, 7, { 1.929687, 1, 1.062500, 0 } },
- { "OLYMPUS", "E-PL3", Shade, -7, { 2.328125, 1, 1.492187, 0 } },
+ { "OLYMPUS", "E-PL3", Daylight, 7, { 2.250000, 1, 1.242187, 0 } },
+ { "OLYMPUS", "E-PL3", Shade, -7, { 2.046875, 1, 1.312500, 0 } },
{ "OLYMPUS", "E-PL3", Shade, 0, { 2.382812, 1, 1.156250, 0 } },
- { "OLYMPUS", "E-PL3", Shade, 7, { 2.733945, 1.174312, 1, 0 } },
- { "OLYMPUS", "E-PL3", Cloudy, -7, { 2.117187, 1, 1.726563, 0 } },
+ { "OLYMPUS", "E-PL3", Shade, 7, { 2.732283, 1.007874, 1, 0 } },
+ { "OLYMPUS", "E-PL3", Cloudy, -7, { 1.859375, 1, 1.515625, 0 } },
{ "OLYMPUS", "E-PL3", Cloudy, 0, { 2.164063, 1, 1.335938, 0 } },
- { "OLYMPUS", "E-PL3", Cloudy, 7, { 2.142857, 1.015873, 1, 0 } },
- { "OLYMPUS", "E-PL3", Tungsten, -7, { 1.148437, 1, 3.203125, 0 } },
+ { "OLYMPUS", "E-PL3", Cloudy, 7, { 2.460937, 1, 1.148437, 0 } },
+ { "OLYMPUS", "E-PL3", Tungsten, -7, { 1.007812, 1, 2.812500, 0 } },
{ "OLYMPUS", "E-PL3", Tungsten, 0, { 1.171875, 1, 2.468750, 0 } },
- { "OLYMPUS", "E-PL3", Tungsten, 7, { 1.148437, 1, 1.820313, 0 } },
- { "OLYMPUS", "E-PL3", Fluorescent, -7, { 1.914063, 1, 2.507813, 0 } },
+ { "OLYMPUS", "E-PL3", Tungsten, 7, { 1.335937, 1, 2.117187, 0 } },
+ { "OLYMPUS", "E-PL3", Fluorescent, -7, { 1.679688, 1, 2.203125, 0 } },
{ "OLYMPUS", "E-PL3", Fluorescent, 0, { 1.953125, 1,
1.937500, 0 } },
- { "OLYMPUS", "E-PL3", Fluorescent, 7, { 1.914063, 1,
1.429688, 0 } },
- { "OLYMPUS", "E-PL3", Underwater, -7, { 2.335938, 1,
1.921875, 0 } },
+ { "OLYMPUS", "E-PL3", Fluorescent, 7, { 2.226562, 1,
1.664062, 0 } },
+ { "OLYMPUS", "E-PL3", Underwater, -7, { 1.812500, 1,
1.789062, 0 } },
{ "OLYMPUS", "E-PL3", Underwater, 0, { 2.390625, 1, 1.484375, 0 } },
- { "OLYMPUS", "E-PL3", Underwater, 7, { 2.335938, 1, 1.085938, 0 } },
- { "OLYMPUS", "E-PL3", Flash, -7, { 2.523438, 1, 1.617188, 0 } },
+ { "OLYMPUS", "E-PL3", Underwater, 7, { 2.429688, 1, 1.335937, 0 } },
+ { "OLYMPUS", "E-PL3", Flash, -7, { 2.218750, 1, 1.421875, 0 } },
{ "OLYMPUS", "E-PL3", Flash, 0, { 2.585938, 1, 1.250000, 0 } },
- { "OLYMPUS", "E-PL3", Flash, 7, { 2.769231, 1.094017, 1, 0 } },
+ { "OLYMPUS", "E-PL3", Flash, 7, { 2.945313, 1, 1.070312, 0 } },
{ "OLYMPUS", "E-PL3", "2000K", 0, { 1, 1.882353, 6.897059, 0 } },
{ "OLYMPUS", "E-PL3", "2050K", 0, { 1, 1.684211, 5.986842, 0 } },
{ "OLYMPUS", "E-PL3", "2100K", 0, { 1, 1.560976, 5.402439, 0 } },
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
ufraw-cvs mailing list
ufraw-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs
