Update of /cvsroot/ufraw/ufraw
In directory vz-cvs-3.sog:/tmp/cvs-serv27874
Modified Files:
wb_presets.c
Log Message:
Added wb presets for the Canon EOS-1DS.
Some style fixes.
Index: wb_presets.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/wb_presets.c,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -d -r1.188 -r1.189
--- wb_presets.c 14 Sep 2011 04:00:38 -0000 1.188
+++ wb_presets.c 27 Sep 2011 03:28:42 -0000 1.189
@@ -1042,6 +1042,14 @@
{ "Canon", "EOS Kiss Digital X50", WhiteFluorescent, 0, { 1.9541, 1, 2.0732,
0 } },
{ "Canon", "EOS Kiss Digital X50", Flash, 0, { 2.5283, 1, 1.3584, 0 } },
+
+ { "Canon", "EOS-1DS", Daylight, 0, {1.6133, 1, 1.2500, 0 } }, /*
5302K */
+ { "Canon", "EOS-1DS", Shade, 0, {1.8477, 1, 1.0684, 0 } }, /*
6685K */
+ { "Canon", "EOS-1DS", Cloudy, 0, {1.7285, 1, 1.1504, 0 } }, /*
5940K */
+ { "Canon", "EOS-1DS", Tungsten, 0, {1.1270, 1, 1.9199, 0 } }, /*
3334K */
+ { "Canon", "EOS-1DS", Fluorescent, 0, {1.2012, 1, 1.7168, 0 }
}, /* 3643K */
+ { "Canon", "EOS-1DS", Flash, 0, {1.7793, 1, 1.1445, 0 } }, /*
6184K */
+
// Firmware Version 1.1.6
{ "Canon", "EOS-1Ds Mark II", Daylight, 0, { 1.992188, 1, 1.503906, 0 } },
{ "Canon", "EOS-1Ds Mark II", Shade, 0, { 2.300781, 1, 1.243164, 0 } },
@@ -1098,7 +1106,7 @@
{ "FUJIFILM", "FinePix S20Pro", DaylightFluorescent, 0, { 2.097826, 1,
1.304348, 0 } },
{ "FUJIFILM", "FinePix S20Pro", WarmWhiteFluorescent, 0, { 1.782609, 1,
1.619565, 0 } },
{ "FUJIFILM", "FinePix S20Pro", CoolWhiteFluorescent, 0, { 1.670213, 1,
2.063830, 0 } },
- { "FUJIFILM", "FinePix S20Pro", Incandescent, 0, { 1.069565, 1, 2.486957 } },
+ { "FUJIFILM", "FinePix S20Pro", Incandescent, 0, { 1.069565, 1, 2.486957, 0
} },
{ "FUJIFILM", "FinePix S2Pro", Daylight, 0, { 1.509804, 1, 1.401961, 0 } },
{ "FUJIFILM", "FinePix S2Pro", Cloudy, 0, { 1.666667, 1, 1.166667, 0 } },
@@ -1171,58 +1179,58 @@
{ "FUJIFILM", "FinePix S9500", CoolWhiteFluorescent, 0, { 1.546196, 1,
1.622283, 0 } },
{ "FUJIFILM", "FinePix S9500", Incandescent, 0, { 1.064159, 1, 1.960177, 0 }
},
- { "FUJIFILM", "FinePix S9100", Daylight, 0, { 1.506250, 1, 1.318750 } },
- { "FUJIFILM", "FinePix S9100", Cloudy, 0, { 1.587500, 1, 1.128125 } },
- { "FUJIFILM", "FinePix S9100", DaylightFluorescent, 0, { 1.777174, 1,
1.138587 } },
- { "FUJIFILM", "FinePix S9100", WarmWhiteFluorescent, 0, { 1.521739, 1,
1.380435 } },
- { "FUJIFILM", "FinePix S9100", CoolWhiteFluorescent, 0, { 1.437500, 1,
1.720109 } },
- { "FUJIFILM", "FinePix S9100", Incandescent, 0, { 1, 1.024943, 2.113379 } },
+ { "FUJIFILM", "FinePix S9100", Daylight, 0, { 1.506250, 1, 1.318750, 0 } },
+ { "FUJIFILM", "FinePix S9100", Cloudy, 0, { 1.587500, 1, 1.128125, 0 } },
+ { "FUJIFILM", "FinePix S9100", DaylightFluorescent, 0, { 1.777174, 1,
1.138587, 0 } },
+ { "FUJIFILM", "FinePix S9100", WarmWhiteFluorescent, 0, { 1.521739, 1,
1.380435, 0 } },
+ { "FUJIFILM", "FinePix S9100", CoolWhiteFluorescent, 0, { 1.437500, 1,
1.720109, 0 } },
+ { "FUJIFILM", "FinePix S9100", Incandescent, 0, { 1, 1.024943, 2.113379, 0 }
},
- { "FUJIFILM", "FinePix S9600", Daylight, 0, { 1.534375, 1, 1.300000 } },
- { "FUJIFILM", "FinePix S9600", Shade, 0, { 1.615625, 1, 1.112500 } },
- { "FUJIFILM", "FinePix S9600", DaylightFluorescent, 0, { 1.809783, 1,
1.122283 } },
- { "FUJIFILM", "FinePix S9600", WarmWhiteFluorescent, 0, { 1.551630, 1,
1.361413 } },
- { "FUJIFILM", "FinePix S9600", CoolWhiteFluorescent, 0, { 1.467391, 1,
1.692935 } },
- { "FUJIFILM", "FinePix S9600", Incandescent, 0, { 1, 1.004444, 2.040000 } },
+ { "FUJIFILM", "FinePix S9600", Daylight, 0, { 1.534375, 1, 1.300000, 0 } },
+ { "FUJIFILM", "FinePix S9600", Shade, 0, { 1.615625, 1, 1.112500, 0 } },
+ { "FUJIFILM", "FinePix S9600", DaylightFluorescent, 0, { 1.809783, 1,
1.122283, 0 } },
+ { "FUJIFILM", "FinePix S9600", WarmWhiteFluorescent, 0, { 1.551630, 1,
1.361413, 0 } },
+ { "FUJIFILM", "FinePix S9600", CoolWhiteFluorescent, 0, { 1.467391, 1,
1.692935, 0 } },
+ { "FUJIFILM", "FinePix S9600", Incandescent, 0, { 1, 1.004444, 2.040000, 0 }
},
- { "FUJIFILM", "FinePix X100", Daylight, 0, { 1.4503, 1, 1.5033 } },
- { "FUJIFILM", "FinePix X100", Shade, 0, { 1.5861, 1, 1.2947 } },
- { "FUJIFILM", "FinePix X100", DaylightFluorescent, 0, { 1.8841, 1, 1.3179 }
},
- { "FUJIFILM", "FinePix X100", WarmWhiteFluorescent, 0, { 1.6291, 1, 1.5927 }
},
- { "FUJIFILM", "FinePix X100", CoolWhiteFluorescent, 0, { 1.5662, 1, 2.0265 }
},
- { "FUJIFILM", "FinePix X100", Incandescent, 0, { 1, 1.0272, 2.4966 } },
- { "FUJIFILM", "FinePix X100", Underwater, 0, { 1.4603, 1, 1.5662 } },
- { "FUJIFILM", "FinePix X100", "2500K", 0, { 1, 1.6503, 5.1858 } },
- { "FUJIFILM", "FinePix X100", "2550K", 0, { 1, 1.5729, 4.7917 } },
- { "FUJIFILM", "FinePix X100", "2650K", 0, { 1, 1.4313, 4.1090 } },
- { "FUJIFILM", "FinePix X100", "2700K", 0, { 1, 1.3790, 3.8447 } },
- { "FUJIFILM", "FinePix X100", "2800K", 0, { 1, 1.2797, 3.3814 } },
- { "FUJIFILM", "FinePix X100", "2850K", 0, { 1, 1.2377, 3.1844 } },
- { "FUJIFILM", "FinePix X100", "2950K", 0, { 1, 1.1660, 2.8571 } },
- { "FUJIFILM", "FinePix X100", "3000K", 0, { 1, 1.1353, 2.7180 } },
- { "FUJIFILM", "FinePix X100", "3100K", 0, { 1, 1.0824, 2.4731 } },
- { "FUJIFILM", "FinePix X100", "3200K", 0, { 1, 1.0342, 2.2671 } },
- { "FUJIFILM", "FinePix X100", "3300K", 0, { 1.0066, 1, 2.1060 } },
- { "FUJIFILM", "FinePix X100", "3400K", 0, { 1.0430, 1, 2.0265 } },
- { "FUJIFILM", "FinePix X100", "3600K", 0, { 1.1159, 1, 1.8907 } },
- { "FUJIFILM", "FinePix X100", "3700K", 0, { 1.1457, 1, 1.8311 } },
- { "FUJIFILM", "FinePix X100", "3800K", 0, { 1.1755, 1, 1.7781 } },
- { "FUJIFILM", "FinePix X100", "4000K", 0, { 1.2351, 1, 1.6821 } },
- { "FUJIFILM", "FinePix X100", "4200K", 0, { 1.2848, 1, 1.5993 } },
- { "FUJIFILM", "FinePix X100", "4300K", 0, { 1.3079, 1, 1.5662 } },
- { "FUJIFILM", "FinePix X100", "4500K", 0, { 1.3543, 1, 1.5000 } },
- { "FUJIFILM", "FinePix X100", "4800K", 0, { 1.4172, 1, 1.4205 } },
- { "FUJIFILM", "FinePix X100", "5000K", 0, { 1.4536, 1, 1.3742 } },
- { "FUJIFILM", "FinePix X100", "5300K", 0, { 1.5033, 1, 1.3179 } },
- { "FUJIFILM", "FinePix X100", "5600K", 0, { 1.5530, 1, 1.2715 } },
- { "FUJIFILM", "FinePix X100", "5900K", 0, { 1.5927, 1, 1.2318 } },
- { "FUJIFILM", "FinePix X100", "6300K", 0, { 1.6457, 1, 1.1887 } },
- { "FUJIFILM", "FinePix X100", "6700K", 0, { 1.6921, 1, 1.1556 } },
- { "FUJIFILM", "FinePix X100", "7100K", 0, { 1.7318, 1, 1.1291 } },
- { "FUJIFILM", "FinePix X100", "7700K", 0, { 1.7881, 1, 1.0960 } },
- { "FUJIFILM", "FinePix X100", "8300K", 0, { 1.8377, 1, 1.0728 } },
- { "FUJIFILM", "FinePix X100", "9100K", 0, { 1.8940, 1, 1.0464 } },
- { "FUJIFILM", "FinePix X100", "10000K", 0, { 1.9503, 1, 1.0298 } },
+ { "FUJIFILM", "FinePix X100", Daylight, 0, { 1.4503, 1, 1.5033, 0 } },
+ { "FUJIFILM", "FinePix X100", Shade, 0, { 1.5861, 1, 1.2947, 0 } },
+ { "FUJIFILM", "FinePix X100", DaylightFluorescent, 0, { 1.8841, 1, 1.3179, 0
} },
+ { "FUJIFILM", "FinePix X100", WarmWhiteFluorescent, 0, { 1.6291, 1, 1.5927,
0 } },
+ { "FUJIFILM", "FinePix X100", CoolWhiteFluorescent, 0, { 1.5662, 1, 2.0265,
0 } },
+ { "FUJIFILM", "FinePix X100", Incandescent, 0, { 1, 1.0272, 2.4966, 0 } },
+ { "FUJIFILM", "FinePix X100", Underwater, 0, { 1.4603, 1, 1.5662, 0 } },
+ { "FUJIFILM", "FinePix X100", "2500K", 0, { 1, 1.6503, 5.1858, 0 } },
+ { "FUJIFILM", "FinePix X100", "2550K", 0, { 1, 1.5729, 4.7917, 0 } },
+ { "FUJIFILM", "FinePix X100", "2650K", 0, { 1, 1.4313, 4.1090, 0 } },
+ { "FUJIFILM", "FinePix X100", "2700K", 0, { 1, 1.3790, 3.8447, 0 } },
+ { "FUJIFILM", "FinePix X100", "2800K", 0, { 1, 1.2797, 3.3814, 0 } },
+ { "FUJIFILM", "FinePix X100", "2850K", 0, { 1, 1.2377, 3.1844, 0 } },
+ { "FUJIFILM", "FinePix X100", "2950K", 0, { 1, 1.1660, 2.8571, 0 } },
+ { "FUJIFILM", "FinePix X100", "3000K", 0, { 1, 1.1353, 2.7180, 0 } },
+ { "FUJIFILM", "FinePix X100", "3100K", 0, { 1, 1.0824, 2.4731, 0 } },
+ { "FUJIFILM", "FinePix X100", "3200K", 0, { 1, 1.0342, 2.2671, 0 } },
+ { "FUJIFILM", "FinePix X100", "3300K", 0, { 1.0066, 1, 2.1060, 0 } },
+ { "FUJIFILM", "FinePix X100", "3400K", 0, { 1.0430, 1, 2.0265, 0 } },
+ { "FUJIFILM", "FinePix X100", "3600K", 0, { 1.1159, 1, 1.8907, 0 } },
+ { "FUJIFILM", "FinePix X100", "3700K", 0, { 1.1457, 1, 1.8311, 0 } },
+ { "FUJIFILM", "FinePix X100", "3800K", 0, { 1.1755, 1, 1.7781, 0 } },
+ { "FUJIFILM", "FinePix X100", "4000K", 0, { 1.2351, 1, 1.6821, 0 } },
+ { "FUJIFILM", "FinePix X100", "4200K", 0, { 1.2848, 1, 1.5993, 0 } },
+ { "FUJIFILM", "FinePix X100", "4300K", 0, { 1.3079, 1, 1.5662, 0 } },
+ { "FUJIFILM", "FinePix X100", "4500K", 0, { 1.3543, 1, 1.5000, 0 } },
+ { "FUJIFILM", "FinePix X100", "4800K", 0, { 1.4172, 1, 1.4205, 0 } },
+ { "FUJIFILM", "FinePix X100", "5000K", 0, { 1.4536, 1, 1.3742, 0 } },
+ { "FUJIFILM", "FinePix X100", "5300K", 0, { 1.5033, 1, 1.3179, 0 } },
+ { "FUJIFILM", "FinePix X100", "5600K", 0, { 1.5530, 1, 1.2715, 0 } },
+ { "FUJIFILM", "FinePix X100", "5900K", 0, { 1.5927, 1, 1.2318, 0 } },
+ { "FUJIFILM", "FinePix X100", "6300K", 0, { 1.6457, 1, 1.1887, 0 } },
+ { "FUJIFILM", "FinePix X100", "6700K", 0, { 1.6921, 1, 1.1556, 0 } },
+ { "FUJIFILM", "FinePix X100", "7100K", 0, { 1.7318, 1, 1.1291, 0 } },
+ { "FUJIFILM", "FinePix X100", "7700K", 0, { 1.7881, 1, 1.0960, 0 } },
+ { "FUJIFILM", "FinePix X100", "8300K", 0, { 1.8377, 1, 1.0728, 0 } },
+ { "FUJIFILM", "FinePix X100", "9100K", 0, { 1.8940, 1, 1.0464, 0 } },
+ { "FUJIFILM", "FinePix X100", "10000K", 0, { 1.9503, 1, 1.0298, 0 } },
{ "KODAK", "P850 ZOOM", Daylight, 0, { 1.859375, 1, 1.566406, 0 } },
{ "KODAK", "P850 ZOOM", Cloudy, 0, { 1.960938, 1, 1.570313, 0 } },
@@ -3441,7 +3449,7 @@
{ "OLYMPUS", "E-600", DaylightFluorescent, -7, { 2.039063, 1, 1.632813, 0 }
},
{ "OLYMPUS", "E-600", DaylightFluorescent, 0, { 2.085937, 1,
1.265625, 0 } },
{ "OLYMPUS", "E-600", DaylightFluorescent, 7, { 2.193277, 1.075630,
1, 0 } },
- { "OLYMPUS", "E-600", Flash, -7, { 1.992187, 1, 1.492187, 0 } },
+ { "OLYMPUS", "E-600", Flash, -7, { 1.992187, 1, 1.492187, 0 } },
{ "OLYMPUS", "E-600", Flash, 0, { 2.039063, 1, 1.156250, 0 } },
{ "OLYMPUS", "E-600", Flash, 7, { 2.339450, 1.174312, 1, 0 } },
@@ -3467,7 +3475,7 @@
{ "OLYMPUS", "E-620", DaylightFluorescent, -7, { 2.000000, 1, 1.687500, 0 }
},
{ "OLYMPUS", "E-620", DaylightFluorescent, 0, { 2.046875, 1,
1.304687, 0 } },
{ "OLYMPUS", "E-620", DaylightFluorescent, 7, { 2.098361, 1.049180,
1, 0 } },
- { "OLYMPUS", "E-620", Flash, -7, { 1.992187, 1, 1.546875, 0 } },
+ { "OLYMPUS", "E-620", Flash, -7, { 1.992187, 1, 1.546875, 0 } },
{ "OLYMPUS", "E-620", Flash, 0, { 2.039063, 1, 1.195313, 0 } },
{ "OLYMPUS", "E-620", Flash, 7, { 2.276786, 1.142857, 1, 0 } },
------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure contains a
definitive record of customers, application performance, security
threats, fraudulent activity and more. Splunk takes this data and makes
sense of it. Business sense. IT sense. Common sense.
http://p.sf.net/sfu/splunk-d2dcopy1
_______________________________________________
ufraw-cvs mailing list
ufraw-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs
