Update of /cvsroot/ufraw/ufraw
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv8831
Modified Files:
wb_presets.c
Log Message:
Remove FinePix from camera model names to follow the changes made in DCRaw
9.15. Thanks to Artis Rozentals for the bug report.
Index: wb_presets.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/wb_presets.c,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -d -r1.237 -r1.238
--- wb_presets.c 23 Jan 2013 03:45:15 -0000 1.237
+++ wb_presets.c 24 Jan 2013 03:15:12 -0000 1.238
@@ -1683,164 +1683,165 @@
{ "Canon", "EOS", Shade, 0, { 2.300781, 1, 1.334961, 0 } },
{ "Canon", "EOS", Fluorescent, 0, { 1.784180, 1, 2.275391, 0 } },
- { "FUJIFILM", "FinePix E900", Daylight, 0, { 1.571875, 1, 1.128125, 0 } },
- { "FUJIFILM", "FinePix E900", Shade, 0, { 1.668750, 1, 1.006250, 0 } },
- { "FUJIFILM", "FinePix E900", DaylightFluorescent, 0, { 1.907609, 1,
1.016304, 0 } },
- { "FUJIFILM", "FinePix E900", WarmWhiteFluorescent, 0, { 1.654891, 1,
1.241848, 0 } },
- { "FUJIFILM", "FinePix E900", CoolWhiteFluorescent, 0, { 1.554348, 1,
1.519022, 0 } },
- { "FUJIFILM", "FinePix E900", Incandescent, 0, { 1.037611, 1, 1.842920, 0 }
},
+ { "FUJIFILM", "E900", Daylight, 0, { 1.571875, 1, 1.128125, 0 } },
+ { "FUJIFILM", "E900", Shade, 0, { 1.668750, 1, 1.006250, 0 } },
+ { "FUJIFILM", "E900", DaylightFluorescent, 0, { 1.907609, 1,
1.016304, 0 } },
+ { "FUJIFILM", "E900", WarmWhiteFluorescent, 0, { 1.654891, 1, 1.241848, 0 }
},
+ { "FUJIFILM", "E900", CoolWhiteFluorescent, 0, { 1.554348, 1, 1.519022, 0 }
},
+ { "FUJIFILM", "E900", Incandescent, 0, { 1.037611, 1, 1.842920, 0 } },
- { "FUJIFILM", "FinePix F700", Daylight, 0, { 1.725000, 1, 1.500000, 0 } },
- { "FUJIFILM", "FinePix F700", Shade, 0, { 1.950000, 1, 1.325000, 0 } },
- { "FUJIFILM", "FinePix F700", DaylightFluorescent, 0, { 2.032609, 1,
1.336957, 0 } },
- { "FUJIFILM", "FinePix F700", WarmWhiteFluorescent, 0, { 1.706522, 1,
1.663043, 0 } },
- { "FUJIFILM", "FinePix F700", CoolWhiteFluorescent, 0, { 1.684783, 1,
2.152174, 0 } },
- { "FUJIFILM", "FinePix F700", Incandescent, 0, { 1.168142, 1, 2.477876, 0 }
},
+ { "FUJIFILM", "F700", Daylight, 0, { 1.725000, 1, 1.500000, 0 } },
+ { "FUJIFILM", "F700", Shade, 0, { 1.950000, 1, 1.325000, 0 } },
+ { "FUJIFILM", "F700", DaylightFluorescent, 0, { 2.032609, 1,
1.336957, 0 } },
+ { "FUJIFILM", "F700", WarmWhiteFluorescent, 0, { 1.706522, 1, 1.663043, 0 }
},
+ { "FUJIFILM", "F700", CoolWhiteFluorescent, 0, { 1.684783, 1, 2.152174, 0 }
},
+ { "FUJIFILM", "F700", Incandescent, 0, { 1.168142, 1, 2.477876, 0 } },
- { "FUJIFILM", "FinePix HS20EXR", Daylight, 0, { 1.4107, 1, 1.9702, 0
} },
- { "FUJIFILM", "FinePix HS20EXR", Shade, 0, { 1.5804, 1, 1.7440, 0 } },
- { "FUJIFILM", "FinePix HS20EXR", DaylightFluorescent, 0, { 1.7292, 1,
1.7470, 0 } },
- { "FUJIFILM", "FinePix HS20EXR", WarmWhiteFluorescent, 0, { 1.4821, 1,
2.0476, 0 } },
- { "FUJIFILM", "FinePix HS20EXR", CoolWhiteFluorescent, 0, { 1.5625, 1,
2.5714, 0 } },
- { "FUJIFILM", "FinePix HS20EXR", Incandescent, 0, { 1, 1.0633, 2.9430, 0 } },
+ { "FUJIFILM", "HS20EXR", Daylight, 0, { 1.4107, 1, 1.9702, 0
} },
+ { "FUJIFILM", "HS20EXR", Shade, 0, { 1.5804, 1, 1.7440, 0 } },
+ { "FUJIFILM", "HS20EXR", DaylightFluorescent, 0, { 1.7292, 1, 1.7470, 0 } },
+ { "FUJIFILM", "HS20EXR", WarmWhiteFluorescent, 0, { 1.4821, 1, 2.0476, 0 } },
+ { "FUJIFILM", "HS20EXR", CoolWhiteFluorescent, 0, { 1.5625, 1, 2.5714, 0 } },
+ { "FUJIFILM", "HS20EXR", Incandescent, 0, { 1, 1.0633, 2.9430, 0 } },
- { "FUJIFILM", "FinePix S100FS", Daylight, 0, { 1.702381, 1, 1.845238, 0 } },
- { "FUJIFILM", "FinePix S100FS", Shade, 0, { 1.830357, 1, 1.601190, 0 } },
- { "FUJIFILM", "FinePix S100FS", DaylightFluorescent, 0, { 1.895833, 1,
1.461309, 0 } },
- { "FUJIFILM", "FinePix S100FS", WarmWhiteFluorescent, 0, { 1.574405, 1,
1.818452, 0 } },
- { "FUJIFILM", "FinePix S100FS", CoolWhiteFluorescent, 0, { 1.663690, 1,
2.309524, 0 } },
- { "FUJIFILM", "FinePix S100FS", Incandescent, 0, { 1.107143, 1, 2.815476, 0
} },
+ { "FUJIFILM", "S100FS", Daylight, 0, { 1.702381, 1, 1.845238, 0 } },
+ { "FUJIFILM", "S100FS", Shade, 0, { 1.830357, 1, 1.601190, 0 } },
+ { "FUJIFILM", "S100FS", DaylightFluorescent, 0, { 1.895833, 1, 1.461309, 0 }
},
+ { "FUJIFILM", "S100FS", WarmWhiteFluorescent, 0, { 1.574405, 1, 1.818452, 0
} },
+ { "FUJIFILM", "S100FS", CoolWhiteFluorescent, 0, { 1.663690, 1, 2.309524, 0
} },
+ { "FUJIFILM", "S100FS", Incandescent, 0, { 1.107143, 1, 2.815476, 0 } },
- { "FUJIFILM", "FinePix S20Pro", Daylight, 0, { 1.712500, 1, 1.500000, 0 } },
- { "FUJIFILM", "FinePix S20Pro", Cloudy, 0, { 1.887500, 1, 1.262500, 0 } },
- { "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, 0
} },
+ { "FUJIFILM", "S20Pro", Daylight, 0, { 1.712500, 1, 1.500000, 0 } },
+ { "FUJIFILM", "S20Pro", Cloudy, 0, { 1.887500, 1, 1.262500, 0 } },
+ { "FUJIFILM", "S20Pro", DaylightFluorescent, 0, { 2.097826, 1, 1.304348, 0 }
},
+ { "FUJIFILM", "S20Pro", WarmWhiteFluorescent, 0, { 1.782609, 1, 1.619565, 0
} },
+ { "FUJIFILM", "S20Pro", CoolWhiteFluorescent, 0, { 1.670213, 1, 2.063830, 0
} },
+ { "FUJIFILM", "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 } },
- { "FUJIFILM", "FinePix S2Pro", Flash, 0, { 1, 1.014084, 2.542253, 0 } },
- { "FUJIFILM", "FinePix S2Pro", DaylightFluorescent, 0, { 1.948718, 1,
1.230769, 0 } },
- { "FUJIFILM", "FinePix S2Pro", WarmWhiteFluorescent, 0, { 1.675214, 1,
1.572650, 0 } },
- { "FUJIFILM", "FinePix S2Pro", CoolWhiteFluorescent, 0, { 1.649573, 1,
2.094017, 0 } },
+ { "FUJIFILM", "S2Pro", Daylight, 0, { 1.509804, 1, 1.401961, 0 } },
+ { "FUJIFILM", "S2Pro", Cloudy, 0, { 1.666667, 1, 1.166667, 0 } },
+ { "FUJIFILM", "S2Pro", Flash, 0, { 1, 1.014084, 2.542253, 0 } },
+ { "FUJIFILM", "S2Pro", DaylightFluorescent, 0, { 1.948718, 1, 1.230769, 0 }
},
+ { "FUJIFILM", "S2Pro", WarmWhiteFluorescent, 0, { 1.675214, 1, 1.572650, 0 }
},
+ { "FUJIFILM", "S2Pro", CoolWhiteFluorescent, 0, { 1.649573, 1, 2.094017, 0 }
},
- { "FUJIFILM", "FinePix S5000", Incandescent, 0, { 1.212081, 1, 2.672364, 0 }
},
- { "FUJIFILM", "FinePix S5000", Fluorescent, 0, { 1.772316, 1, 2.349902, 0 }
},
- { "FUJIFILM", "FinePix S5000", Daylight, 0, { 1.860403, 1, 1.515946, 0 } },
- { "FUJIFILM", "FinePix S5000", Flash, 0, { 2.202181, 1, 1.423284, 0 } },
- { "FUJIFILM", "FinePix S5000", Cloudy, 0, { 2.036578, 1, 1.382513, 0 } },
- { "FUJIFILM", "FinePix S5000", Shade, 0, { 2.357215, 1, 1.212016, 0 } },
+ { "FUJIFILM", "S5000", Incandescent, 0, { 1.212081, 1, 2.672364, 0 } },
+ { "FUJIFILM", "S5000", Fluorescent, 0, { 1.772316, 1, 2.349902, 0 } },
+ { "FUJIFILM", "S5000", Daylight, 0, { 1.860403, 1, 1.515946, 0 } },
+ { "FUJIFILM", "S5000", Flash, 0, { 2.202181, 1, 1.423284, 0 } },
+ { "FUJIFILM", "S5000", Cloudy, 0, { 2.036578, 1, 1.382513, 0 } },
+ { "FUJIFILM", "S5000", Shade, 0, { 2.357215, 1, 1.212016, 0 } },
- { "FUJIFILM", "FinePix S5200", Daylight, 0, { 1.587500, 1, 1.381250, 0 } },
- { "FUJIFILM", "FinePix S5200", Shade, 0, { 1.946875, 1, 1.175000, 0 } },
- { "FUJIFILM", "FinePix S5200", DaylightFluorescent, 0, { 1.948370, 1,
1.187500, 0 } },
- { "FUJIFILM", "FinePix S5200", WarmWhiteFluorescent, 0, { 1.682065, 1,
1.437500, 0 } },
- { "FUJIFILM", "FinePix S5200", CoolWhiteFluorescent, 0, { 1.595109, 1,
1.839674, 0 } },
- { "FUJIFILM", "FinePix S5200", Incandescent, 0, { 1.077434, 1, 2.170354, 0 }
},
+ { "FUJIFILM", "S5200", Daylight, 0, { 1.587500, 1, 1.381250, 0 } },
+ { "FUJIFILM", "S5200", Shade, 0, { 1.946875, 1, 1.175000, 0 } },
+ { "FUJIFILM", "S5200", DaylightFluorescent, 0, { 1.948370, 1, 1.187500, 0 }
},
+ { "FUJIFILM", "S5200", WarmWhiteFluorescent, 0, { 1.682065, 1, 1.437500, 0 }
},
+ { "FUJIFILM", "S5200", CoolWhiteFluorescent, 0, { 1.595109, 1, 1.839674, 0 }
},
+ { "FUJIFILM", "S5200", Incandescent, 0, { 1.077434, 1, 2.170354, 0 } },
- { "FUJIFILM", "FinePix S5500", Daylight, 0, { 1.712500, 1, 1.550000, 0 } },
- { "FUJIFILM", "FinePix S5500", Shade, 0, { 1.912500, 1, 1.375000, 0 } },
- { "FUJIFILM", "FinePix S5500", DaylightFluorescent, 0, { 1.978261, 1,
1.380435, 0 } },
- { "FUJIFILM", "FinePix S5500", WarmWhiteFluorescent, 0, { 1.673913, 1,
1.673913, 0 } },
- { "FUJIFILM", "FinePix S5500", CoolWhiteFluorescent, 0, { 1.663043, 1,
2.163043, 0 } },
- { "FUJIFILM", "FinePix S5500", Incandescent, 0, { 1.115044, 1, 2.566372, 0 }
},
+ { "FUJIFILM", "S5500", Daylight, 0, { 1.712500, 1, 1.550000, 0 } },
+ { "FUJIFILM", "S5500", Shade, 0, { 1.912500, 1, 1.375000, 0 } },
+ { "FUJIFILM", "S5500", DaylightFluorescent, 0, { 1.978261, 1, 1.380435, 0 }
},
+ { "FUJIFILM", "S5500", WarmWhiteFluorescent, 0, { 1.673913, 1, 1.673913, 0 }
},
+ { "FUJIFILM", "S5500", CoolWhiteFluorescent, 0, { 1.663043, 1, 2.163043, 0 }
},
+ { "FUJIFILM", "S5500", Incandescent, 0, { 1.115044, 1, 2.566372, 0 } },
- { "FUJIFILM", "FinePix S5600", Daylight, 0, { 1.587500, 1, 1.381250, 0 } },
- { "FUJIFILM", "FinePix S5600", Shade, 0, { 1.946875, 1, 1.175000, 0 } },
- { "FUJIFILM", "FinePix S5600", DaylightFluorescent, 0, { 1.948370, 1,
1.187500, 0 } },
- { "FUJIFILM", "FinePix S5600", WarmWhiteFluorescent, 0, { 1.682065, 1,
1.437500, 0 } },
- { "FUJIFILM", "FinePix S5600", CoolWhiteFluorescent, 0, { 1.595109, 1,
1.839674, 0 } },
- { "FUJIFILM", "FinePix S5600", Incandescent, 0, { 1.077434, 1, 2.170354, 0 }
},
+ { "FUJIFILM", "S5600", Daylight, 0, { 1.587500, 1, 1.381250, 0 } },
+ { "FUJIFILM", "S5600", Shade, 0, { 1.946875, 1, 1.175000, 0 } },
+ { "FUJIFILM", "S5600", DaylightFluorescent, 0, { 1.948370, 1, 1.187500, 0 }
},
+ { "FUJIFILM", "S5600", WarmWhiteFluorescent, 0, { 1.682065, 1, 1.437500, 0 }
},
+ { "FUJIFILM", "S5600", CoolWhiteFluorescent, 0, { 1.595109, 1, 1.839674, 0 }
},
+ { "FUJIFILM", "S5600", Incandescent, 0, { 1.077434, 1, 2.170354, 0 } },
- { "FUJIFILM", "FinePix S6000fd", Daylight, 0, { 1.511905, 1,
1.431548, 0 } },
- { "FUJIFILM", "FinePix S6000fd", Shade, 0, { 1.699405, 1, 1.232143, 0 } },
- { "FUJIFILM", "FinePix S6000fd", DaylightFluorescent, 0, { 1.866071, 1,
1.309524, 0 } },
- { "FUJIFILM", "FinePix S6000fd", WarmWhiteFluorescent, 0, { 1.568452, 1,
1.627976, 0 } },
- { "FUJIFILM", "FinePix S6000fd", CoolWhiteFluorescent, 0, { 1.598214, 1,
2.038691, 0 } },
- { "FUJIFILM", "FinePix S6000fd", Incandescent, 0, { 1, 1.024390, 2.466463, 0
} },
+ { "FUJIFILM", "S6000fd", Daylight, 0, { 1.511905, 1,
1.431548, 0 } },
+ { "FUJIFILM", "S6000fd", Shade, 0, { 1.699405, 1, 1.232143, 0 } },
+ { "FUJIFILM", "S6000fd", DaylightFluorescent, 0, { 1.866071, 1, 1.309524, 0
} },
+ { "FUJIFILM", "S6000fd", WarmWhiteFluorescent, 0, { 1.568452, 1, 1.627976, 0
} },
+ { "FUJIFILM", "S6000fd", CoolWhiteFluorescent, 0, { 1.598214, 1, 2.038691, 0
} },
+ { "FUJIFILM", "S6000fd", Incandescent, 0, { 1, 1.024390, 2.466463, 0 } },
- { "FUJIFILM", "FinePix S6500fd", Daylight, 0, { 1.398810, 1,
1.470238, 0 } },
- { "FUJIFILM", "FinePix S6500fd", Shade, 0, { 1.580357, 1, 1.270833, 0 } },
- { "FUJIFILM", "FinePix S6500fd", DaylightFluorescent, 0, { 1.735119, 1,
1.348214, 0 } },
- { "FUJIFILM", "FinePix S6500fd", WarmWhiteFluorescent, 0, { 1.455357, 1,
1.672619, 0 } },
- { "FUJIFILM", "FinePix S6500fd", CoolWhiteFluorescent, 0, { 1.482143, 1,
2.089286, 0 } },
- { "FUJIFILM", "FinePix S6500fd", Incandescent, 0, { 1, 1.123746, 2.769231, 0
} },
+ { "FUJIFILM", "S6500fd", Daylight, 0, { 1.398810, 1,
1.470238, 0 } },
+ { "FUJIFILM", "S6500fd", Shade, 0, { 1.580357, 1, 1.270833, 0 } },
+ { "FUJIFILM", "S6500fd", DaylightFluorescent, 0, { 1.735119, 1, 1.348214, 0
} },
+ { "FUJIFILM", "S6500fd", WarmWhiteFluorescent, 0, { 1.455357, 1, 1.672619, 0
} },
+ { "FUJIFILM", "S6500fd", CoolWhiteFluorescent, 0, { 1.482143, 1, 2.089286, 0
} },
+ { "FUJIFILM", "S6500fd", Incandescent, 0, { 1, 1.123746, 2.769231, 0 } },
- { "FUJIFILM", "FinePix S7000", Daylight, 0, { 1.900000, 1, 1.525000, 0 } },
- { "FUJIFILM", "FinePix S7000", Shade, 0, { 2.137500, 1, 1.350000, 0 } },
- { "FUJIFILM", "FinePix S7000", DaylightFluorescent, 0, { 2.315217, 1,
1.347826, 0 } },
- { "FUJIFILM", "FinePix S7000", WarmWhiteFluorescent, 0, { 1.902174, 1,
1.663043, 0 } },
- { "FUJIFILM", "FinePix S7000", CoolWhiteFluorescent, 0, { 1.836957, 1,
2.130435, 0 } },
- { "FUJIFILM", "FinePix S7000", Incandescent, 0, { 1.221239, 1, 2.548673, 0 }
},
+ { "FUJIFILM", "S7000", Daylight, 0, { 1.900000, 1, 1.525000, 0 } },
+ { "FUJIFILM", "S7000", Shade, 0, { 2.137500, 1, 1.350000, 0 } },
+ { "FUJIFILM", "S7000", DaylightFluorescent, 0, { 2.315217, 1, 1.347826, 0 }
},
+ { "FUJIFILM", "S7000", WarmWhiteFluorescent, 0, { 1.902174, 1, 1.663043, 0 }
},
+ { "FUJIFILM", "S7000", CoolWhiteFluorescent, 0, { 1.836957, 1, 2.130435, 0 }
},
+ { "FUJIFILM", "S7000", Incandescent, 0, { 1.221239, 1, 2.548673, 0 } },
/* The S9000 and S9500 are the same camera */
- { "FUJIFILM", "FinePix S9000", Daylight, 0, { 1.618750, 1, 1.231250, 0 } },
- { "FUJIFILM", "FinePix S9000", Cloudy, 0, { 1.700000, 1, 1.046875, 0 } },
- { "FUJIFILM", "FinePix S9000", DaylightFluorescent, 0, { 1.902174, 1,
1.057065, 0 } },
- { "FUJIFILM", "FinePix S9000", WarmWhiteFluorescent, 0, { 1.633152, 1,
1.293478, 0 } },
- { "FUJIFILM", "FinePix S9000", CoolWhiteFluorescent, 0, { 1.546196, 1,
1.622283, 0 } },
- { "FUJIFILM", "FinePix S9000", Incandescent, 0, { 1.064159, 1, 1.960177, 0 }
},
+ { "FUJIFILM", "S9000", Daylight, 0, { 1.618750, 1, 1.231250, 0 } },
+ { "FUJIFILM", "S9000", Cloudy, 0, { 1.700000, 1, 1.046875, 0 } },
+ { "FUJIFILM", "S9000", DaylightFluorescent, 0, { 1.902174, 1, 1.057065, 0 }
},
+ { "FUJIFILM", "S9000", WarmWhiteFluorescent, 0, { 1.633152, 1, 1.293478, 0 }
},
+ { "FUJIFILM", "S9000", CoolWhiteFluorescent, 0, { 1.546196, 1, 1.622283, 0 }
},
+ { "FUJIFILM", "S9000", Incandescent, 0, { 1.064159, 1, 1.960177, 0 } },
- { "FUJIFILM", "FinePix S9500", Daylight, 0, { 1.618750, 1, 1.231250, 0 } },
- { "FUJIFILM", "FinePix S9500", Cloudy, 0, { 1.700000, 1, 1.046875, 0 } },
- { "FUJIFILM", "FinePix S9500", DaylightFluorescent, 0, { 1.902174, 1,
1.057065, 0 } },
- { "FUJIFILM", "FinePix S9500", WarmWhiteFluorescent, 0, { 1.633152, 1,
1.293478, 0 } },
- { "FUJIFILM", "FinePix S9500", CoolWhiteFluorescent, 0, { 1.546196, 1,
1.622283, 0 } },
- { "FUJIFILM", "FinePix S9500", Incandescent, 0, { 1.064159, 1, 1.960177, 0 }
},
+ { "FUJIFILM", "S9100", Daylight, 0, { 1.506250, 1, 1.318750, 0 } },
+ { "FUJIFILM", "S9100", Cloudy, 0, { 1.587500, 1, 1.128125, 0 } },
+ { "FUJIFILM", "S9100", DaylightFluorescent, 0, { 1.777174, 1, 1.138587, 0 }
},
+ { "FUJIFILM", "S9100", WarmWhiteFluorescent, 0, { 1.521739, 1, 1.380435, 0 }
},
+ { "FUJIFILM", "S9100", CoolWhiteFluorescent, 0, { 1.437500, 1, 1.720109, 0 }
},
+ { "FUJIFILM", "S9100", Incandescent, 0, { 1, 1.024943, 2.113379, 0 } },
- { "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 }
},
+ /* The S9000 and S9500 are the same camera */
+ { "FUJIFILM", "S9500", Daylight, 0, { 1.618750, 1, 1.231250, 0 } },
+ { "FUJIFILM", "S9500", Cloudy, 0, { 1.700000, 1, 1.046875, 0 } },
+ { "FUJIFILM", "S9500", DaylightFluorescent, 0, { 1.902174, 1, 1.057065, 0 }
},
+ { "FUJIFILM", "S9500", WarmWhiteFluorescent, 0, { 1.633152, 1, 1.293478, 0 }
},
+ { "FUJIFILM", "S9500", CoolWhiteFluorescent, 0, { 1.546196, 1, 1.622283, 0 }
},
+ { "FUJIFILM", "S9500", Incandescent, 0, { 1.064159, 1, 1.960177, 0 } },
- { "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", "S9600", Daylight, 0, { 1.534375, 1, 1.300000, 0 } },
+ { "FUJIFILM", "S9600", Shade, 0, { 1.615625, 1, 1.112500, 0 } },
+ { "FUJIFILM", "S9600", DaylightFluorescent, 0, { 1.809783, 1, 1.122283, 0 }
},
+ { "FUJIFILM", "S9600", WarmWhiteFluorescent, 0, { 1.551630, 1, 1.361413, 0 }
},
+ { "FUJIFILM", "S9600", CoolWhiteFluorescent, 0, { 1.467391, 1, 1.692935, 0 }
},
+ { "FUJIFILM", "S9600", Incandescent, 0, { 1, 1.004444, 2.040000, 0 } },
- { "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 } },
+ { "FUJIFILM", "X100", Daylight, 0, { 1.4503, 1, 1.5033, 0 } },
+ { "FUJIFILM", "X100", Shade, 0, { 1.5861, 1, 1.2947, 0 } },
+ { "FUJIFILM", "X100", DaylightFluorescent, 0, { 1.8841, 1, 1.3179, 0
} },
+ { "FUJIFILM", "X100", WarmWhiteFluorescent, 0, { 1.6291, 1, 1.5927, 0 } },
+ { "FUJIFILM", "X100", CoolWhiteFluorescent, 0, { 1.5662, 1, 2.0265, 0 } },
+ { "FUJIFILM", "X100", Incandescent, 0, { 1, 1.0272, 2.4966, 0 } },
+ { "FUJIFILM", "X100", Underwater, 0, { 1.4603, 1, 1.5662, 0 } },
+ { "FUJIFILM", "X100", "2500K", 0, { 1, 1.6503, 5.1858, 0 } },
+ { "FUJIFILM", "X100", "2550K", 0, { 1, 1.5729, 4.7917, 0 } },
+ { "FUJIFILM", "X100", "2650K", 0, { 1, 1.4313, 4.1090, 0 } },
+ { "FUJIFILM", "X100", "2700K", 0, { 1, 1.3790, 3.8447, 0 } },
+ { "FUJIFILM", "X100", "2800K", 0, { 1, 1.2797, 3.3814, 0 } },
+ { "FUJIFILM", "X100", "2850K", 0, { 1, 1.2377, 3.1844, 0 } },
+ { "FUJIFILM", "X100", "2950K", 0, { 1, 1.1660, 2.8571, 0 } },
+ { "FUJIFILM", "X100", "3000K", 0, { 1, 1.1353, 2.7180, 0 } },
+ { "FUJIFILM", "X100", "3100K", 0, { 1, 1.0824, 2.4731, 0 } },
+ { "FUJIFILM", "X100", "3200K", 0, { 1, 1.0342, 2.2671, 0 } },
+ { "FUJIFILM", "X100", "3300K", 0, { 1.0066, 1, 2.1060, 0 } },
+ { "FUJIFILM", "X100", "3400K", 0, { 1.0430, 1, 2.0265, 0 } },
+ { "FUJIFILM", "X100", "3600K", 0, { 1.1159, 1, 1.8907, 0 } },
+ { "FUJIFILM", "X100", "3700K", 0, { 1.1457, 1, 1.8311, 0 } },
+ { "FUJIFILM", "X100", "3800K", 0, { 1.1755, 1, 1.7781, 0 } },
+ { "FUJIFILM", "X100", "4000K", 0, { 1.2351, 1, 1.6821, 0 } },
+ { "FUJIFILM", "X100", "4200K", 0, { 1.2848, 1, 1.5993, 0 } },
+ { "FUJIFILM", "X100", "4300K", 0, { 1.3079, 1, 1.5662, 0 } },
+ { "FUJIFILM", "X100", "4500K", 0, { 1.3543, 1, 1.5000, 0 } },
+ { "FUJIFILM", "X100", "4800K", 0, { 1.4172, 1, 1.4205, 0 } },
+ { "FUJIFILM", "X100", "5000K", 0, { 1.4536, 1, 1.3742, 0 } },
+ { "FUJIFILM", "X100", "5300K", 0, { 1.5033, 1, 1.3179, 0 } },
+ { "FUJIFILM", "X100", "5600K", 0, { 1.5530, 1, 1.2715, 0 } },
+ { "FUJIFILM", "X100", "5900K", 0, { 1.5927, 1, 1.2318, 0 } },
+ { "FUJIFILM", "X100", "6300K", 0, { 1.6457, 1, 1.1887, 0 } },
+ { "FUJIFILM", "X100", "6700K", 0, { 1.6921, 1, 1.1556, 0 } },
+ { "FUJIFILM", "X100", "7100K", 0, { 1.7318, 1, 1.1291, 0 } },
+ { "FUJIFILM", "X100", "7700K", 0, { 1.7881, 1, 1.0960, 0 } },
+ { "FUJIFILM", "X100", "8300K", 0, { 1.8377, 1, 1.0728, 0 } },
+ { "FUJIFILM", "X100", "9100K", 0, { 1.8940, 1, 1.0464, 0 } },
+ { "FUJIFILM", "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 } },
------------------------------------------------------------------------------
Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS,
MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current
with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft
MVPs and experts. ON SALE this month only -- learn more at:
http://p.sf.net/sfu/learnnow-d2d
_______________________________________________
ufraw-cvs mailing list
ufraw-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs
