Menu
▾
▴
ufraw-cvs
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(6) |
Oct
(27) |
Nov
(31) |
Dec
(13) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(29) |
Feb
(42) |
Mar
(26) |
Apr
(21) |
May
(13) |
Jun
(5) |
Jul
(19) |
Aug
(23) |
Sep
(24) |
Oct
(33) |
Nov
(11) |
Dec
(33) |
| 2007 |
Jan
(31) |
Feb
(25) |
Mar
(84) |
Apr
(32) |
May
(36) |
Jun
(48) |
Jul
(53) |
Aug
(46) |
Sep
(45) |
Oct
(62) |
Nov
(63) |
Dec
(31) |
| 2008 |
Jan
(25) |
Feb
(9) |
Mar
(27) |
Apr
(31) |
May
(30) |
Jun
(23) |
Jul
(29) |
Aug
(31) |
Sep
(18) |
Oct
(28) |
Nov
(19) |
Dec
(39) |
| 2009 |
Jan
(68) |
Feb
(15) |
Mar
(11) |
Apr
(10) |
May
(15) |
Jun
(10) |
Jul
(29) |
Aug
(43) |
Sep
(49) |
Oct
(83) |
Nov
(58) |
Dec
(19) |
| 2010 |
Jan
(15) |
Feb
(68) |
Mar
(46) |
Apr
(12) |
May
(10) |
Jun
(6) |
Jul
(8) |
Aug
|
Sep
(2) |
Oct
(2) |
Nov
(14) |
Dec
(4) |
| 2011 |
Jan
(4) |
Feb
(2) |
Mar
(3) |
Apr
(5) |
May
(3) |
Jun
(3) |
Jul
(14) |
Aug
(34) |
Sep
(15) |
Oct
(4) |
Nov
(7) |
Dec
(7) |
| 2012 |
Jan
(13) |
Feb
(2) |
Mar
(5) |
Apr
(4) |
May
(11) |
Jun
(11) |
Jul
(9) |
Aug
(3) |
Sep
(2) |
Oct
(7) |
Nov
(4) |
Dec
(3) |
| 2013 |
Jan
(18) |
Feb
(23) |
Mar
(56) |
Apr
(5) |
May
(9) |
Jun
(10) |
Jul
(4) |
Aug
(5) |
Sep
(8) |
Oct
(20) |
Nov
(2) |
Dec
(4) |
| 2014 |
Jan
(15) |
Feb
(2) |
Mar
|
Apr
(3) |
May
(4) |
Jun
(7) |
Jul
(5) |
Aug
(19) |
Sep
(20) |
Oct
(8) |
Nov
(5) |
Dec
(5) |
| 2015 |
Jan
(7) |
Feb
(28) |
Mar
(7) |
Apr
(8) |
May
(11) |
Jun
(13) |
Jul
(1) |
Aug
(8) |
Sep
(1) |
Oct
(3) |
Nov
(2) |
Dec
(9) |
| 2016 |
Jan
(5) |
Feb
(1) |
Mar
|
Apr
(1) |
May
(3) |
Jun
(3) |
Jul
(4) |
Aug
(7) |
Sep
(2) |
Oct
|
Nov
(3) |
Dec
|
|
From: Niels K. B. J. <nk...@us...> - 2006-02-21 07:24:59
|
Update of /cvsroot/ufraw/ufraw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8832 Modified Files: wb_presets.c Log Message: Add WB fine tuning for MINOLTA DYNAX 7D and OLYMPUS E-1. Index: wb_presets.c =================================================================== RCS file: /cvsroot/ufraw/ufraw/wb_presets.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wb_presets.c 21 Feb 2006 00:05:30 -0000 1.1 --- wb_presets.c 21 Feb 2006 07:24:51 -0000 1.2 *************** *** 169,178 **** --- 169,191 ---- { "MINOLTA", "DYNAX 5D", "Flash", 0, { 1.812500, 1, 1.445312, 0 } }, + { "MINOLTA", "DYNAX 7D", "Daylight", -3, { 1.476562, 1, 1.824219, 0 } }, { "MINOLTA", "DYNAX 7D", "Daylight", 0, { 1.621094, 1, 1.601562, 0 } }, + { "MINOLTA", "DYNAX 7D", "Daylight", 3, { 1.785156, 1, 1.414062, 0 } }, + { "MINOLTA", "DYNAX 7D", "Shade", -3, { 1.683594, 1, 1.585938, 0 } }, { "MINOLTA", "DYNAX 7D", "Shade", 0, { 1.855469, 1, 1.402344, 0 } }, + { "MINOLTA", "DYNAX 7D", "Shade", 3, { 2.031250, 1, 1.226562, 0 } }, + { "MINOLTA", "DYNAX 7D", "Cloudy", -3, { 1.593750, 1, 1.671875, 0 } }, { "MINOLTA", "DYNAX 7D", "Cloudy", 0, { 1.738281, 1, 1.464844, 0 } }, + { "MINOLTA", "DYNAX 7D", "Cloudy", 3, { 1.925781, 1, 1.296875, 0 } }, + { "MINOLTA", "DYNAX 7D", "Tungsten", -3, { 0.867188, 1, 3.765625, 0 } }, { "MINOLTA", "DYNAX 7D", "Tungsten", 0, { 0.945312, 1, 3.292969, 0 } }, + { "MINOLTA", "DYNAX 7D", "Tungsten", 3, { 1.050781, 1, 2.921875, 0 } }, + { "MINOLTA", "DYNAX 7D", "Fluorescent", -2, { 1.058594, 1, 3.230469, 0 } }, { "MINOLTA", "DYNAX 7D", "Fluorescent", 0, { 1.570312, 1, 2.453125, 0 } }, + { "MINOLTA", "DYNAX 7D", "Fluorescent", 1, { 1.625000, 1, 2.226562, 0 } }, + { "MINOLTA", "DYNAX 7D", "Fluorescent", 4, { 2.046875, 1, 1.675781, 0 } }, + { "MINOLTA", "DYNAX 7D", "Flash", -3, { 1.738281, 1, 1.656250, 0 } }, { "MINOLTA", "DYNAX 7D", "Flash", 0, { 1.890625, 1, 1.445312, 0 } }, + { "MINOLTA", "DYNAX 7D", "Flash", 3, { 2.101562, 1, 1.281250, 0 } }, { "NIKON", "D100", "Incandescent", 0, { 1.406250, 1, 2.828125, 0 } }, *************** *** 319,334 **** { "NIKON", "D70", "Shade", 0, { 2.613281, 1, 1.277344, 0 } }, /* 8000K */ { "OLYMPUS", "E-1", "3000K Tungsten", 0, { 1, 1.024000, 1.992000, 0 } }, { "OLYMPUS", "E-1", "3300K", 0, { 1.070312, 1, 1.773438, 0 } }, { "OLYMPUS", "E-1", "3600K Incandescent", 0, { 1.156250, 1, 1.640625, 0 } }, { "OLYMPUS", "E-1", "3900K", 0, { 1.234375, 1, 1.523438, 0 } }, ! { "OLYMPUS", "E-1", "4000K White fluorescent", 0, { 2.062500, 1, 1.679688, 0 } }, { "OLYMPUS", "E-1", "4300K", 0, { 1.414062, 1, 1.343750, 0 } }, ! { "OLYMPUS", "E-1", "4500K Neutral fluorescent", 0, { 1.835938, 1, 1.320312, 0 } }, { "OLYMPUS", "E-1", "4800K", 0, { 1.546875, 1, 1.226562, 0 } }, { "OLYMPUS", "E-1", "5300K Clear day", 0, { 1.664062, 1, 1.140625, 0 } }, ! { "OLYMPUS", "E-1", "6000K Cloudy (with flash)", 0, { 1.796875, 1, 1.046875, 0 } }, ! { "OLYMPUS", "E-1", "6600K Daylight fluorescent", 0, { 2.101562, 1, 1.085938, 0 } }, { "OLYMPUS", "E-1", "7500K Shadows", 0, { 2.196581, 1.094017, 1, 0 } }, { "OLYMPUS", "E-10", "3000K Incandescent", 0, { 1, 1.153153, 3.441442, 0 } }, --- 332,371 ---- { "NIKON", "D70", "Shade", 0, { 2.613281, 1, 1.277344, 0 } }, /* 8000K */ + { "OLYMPUS", "E-1", "3000K Tungsten", -7, { 1.015625, 1, 1.867188, 0 } }, { "OLYMPUS", "E-1", "3000K Tungsten", 0, { 1, 1.024000, 1.992000, 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", 0, { 1.070312, 1, 1.773438, 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", 0, { 1.156250, 1, 1.640625, 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", 0, { 1.234375, 1, 1.523438, 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", 0, { 2.062500, 1, 1.679688, 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", 0, { 1.414062, 1, 1.343750, 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", 0, { 1.835938, 1, 1.320312, 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", 0, { 1.546875, 1, 1.226562, 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", 0, { 1.664062, 1, 1.140625, 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)", 0, { 1.796875, 1, 1.046875, 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", 0, { 2.101562, 1, 1.085938, 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", 0, { 2.196581, 1.094017, 1, 0 } }, + { "OLYMPUS", "E-1", "7500K Shadows", 7, { 1.859375, 1, 1, 0 } }, { "OLYMPUS", "E-10", "3000K Incandescent", 0, { 1, 1.153153, 3.441442, 0 } }, |
|
From: Udi F. <udi...@us...> - 2006-02-21 00:05:35
|
Update of /cvsroot/ufraw/ufraw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25178 Modified Files: Makefile.am ufraw.h ufraw_conf.c ufraw_preview.c ufraw_routines.c ufraw_ufraw.c Added Files: wb_presets.c Log Message: Added suppord for WB presets fine tuning. At the moment there are only fine tuning data for the Nikon D2X. --- NEW FILE: wb_presets.c --- /* * UFRaw - Unidentified Flying Raw converter for digital camera images * by Udi Fuchs, * * wb_presets.c - White balance preset values for various cameras * * UFRaw is licensed under the GNU General Public License. * It uses DCRaw code to do the actual raw decoding. */ #ifdef HAVE_CONFIG_H #include "config.h" #endif #include <glib.h> #include "ufraw.h" /* Column 1 - "make" of the camera. * Column 2 - "model" (use the "make" and "model" as provided by DCRaw). * Column 3 - WB name. * Column 4 - Fine tuning. MUST be in increasing order. 0 for no fine tuning. * It is enough to give only the extreme values, the other values * will be interpolated. * Column 5 - Channel multipliers. */ const wb_data wb_preset[] = { { "", "", "Manual WB", 0, { 0, 0, 0, 0 } }, { "", "", "Camera WB", 0, { 0, 0, 0, 0 } }, { "", "", "Auto WB", 0, { 0, 0, 0, 0 } }, { "Canon", "PowerShot G2", "Daylight", 0, { 2.011483, 1, 1.299522, 0 } }, { "Canon", "PowerShot G2", "Cloudy", 0, { 2.032505, 1, 1.285851, 0 } }, { "Canon", "PowerShot G2", "Tungsten", 0, { 1.976008, 1, 1.332054, 0 } }, { "Canon", "PowerShot G2", "Fluorescent", 0, { 2.022010, 1, 1.295694, 0 } }, { "Canon", "PowerShot G2", "Daylight Fluorescent", 0, { 2.029637, 1, 1.286807, 0 } }, { "Canon", "PowerShot G2", "Flash", 0, { 2.153576, 1, 1.140680, 0 } }, { "Canon", "PowerShot G5", "Daylight", 0, { 1.639521, 1, 1.528144, 0 } }, { "Canon", "PowerShot G5", "Cloudy", 0, { 1.702153, 1, 1.462919, 0 } }, { "Canon", "PowerShot G5", "Tungsten", 0, { 1.135071, 1, 2.374408, 0 } }, { "Canon", "PowerShot G5", "Fluorescent", 0, { 1.660281, 1, 2.186462, 0 } }, { "Canon", "PowerShot G5", "Daylight Fluorescent", 0, { 1.463297, 1, 1.764140, 0 } }, { "Canon", "PowerShot G5", "Flash", 0, { 1.603593, 1, 1.562874, 0 } }, { "Canon", "PowerShot G6", "Daylight", 0, { 1.769704, 1, 1.637931, 0 } }, { "Canon", "PowerShot G6", "Cloudy", 0, { 2.062731, 1, 1.442804, 0 } }, { "Canon", "PowerShot G6", "Tungsten", 0, { 1.077106, 1, 2.721234, 0 } }, { "Canon", "PowerShot G6", "Fluorescent", 0, { 1.914922, 1, 2.142670, 0 } }, { "Canon", "PowerShot G6", "Fluorescent H", 0, { 2.543677, 1, 1.650587, 0 } }, { "Canon", "PowerShot G6", "Flash", 0, { 2.285322, 1, 1.333333, 0 } }, { "Canon", "PowerShot S50", "Daylight", 0, { 1.772506, 1, 1.536496, 0 } }, { "Canon", "PowerShot S50", "Cloudy", 0, { 1.831311, 1, 1.484223, 0 } }, { "Canon", "PowerShot S50", "Tungsten", 0, { 1.185542, 1, 2.480723, 0 } }, { "Canon", "PowerShot S50", "Fluorescent", 0, { 1.706410, 1, 2.160256, 0 } }, { "Canon", "PowerShot S50", "Fluorescent H", 0, { 1.562500, 1, 1.817402, 0 } }, { "Canon", "PowerShot S50", "Flash", 0, { 1.776156, 1, 1.531630, 0 } }, { "Canon", "PowerShot S60", "Daylight", 0, { 1.742169, 1, 1.486747, 0 } }, { "Canon", "PowerShot S60", "Cloudy", 0, { 1.881437, 1, 1.366467, 0 } }, { "Canon", "PowerShot S60", "Tungsten", 0, { 1.144910, 1, 2.566467, 0 } }, { "Canon", "PowerShot S60", "Fluorescent", 0, { 1.714650, 1, 2.053503, 0 } }, { "Canon", "PowerShot S60", "Fluorescent H", 0, { 2.849655, 1, 2.067586, 0 } }, { "Canon", "PowerShot S60", "Flash", 0, { 2.143229, 1, 1.190104, 0 } }, { "Canon", "PowerShot S60", "Underwater", 0, { 2.677109, 1, 1.148193, 0 } }, { "Canon", "PowerShot S70", "Daylight", 0, { 1.943834, 1, 1.456654, 0 } }, { "Canon", "PowerShot S70", "Cloudy", 0, { 2.049939, 1, 1.382460, 0 } }, { "Canon", "PowerShot S70", "Tungsten", 0, { 1.169492, 1, 2.654964, 0 } }, { "Canon", "PowerShot S70", "Fluorescent", 0, { 1.993456, 1, 2.056283, 0 } }, { "Canon", "PowerShot S70", "Fluorescent H", 0, { 2.645914, 1, 1.565499, 0 } }, { "Canon", "PowerShot S70", "Flash", 0, { 2.389189, 1, 1.147297, 0 } }, { "Canon", "PowerShot S70", "Underwater", 0, { 3.110565, 1, 1.162162, 0 } }, { "Canon", "EOS 10D", "Sunlight", 0, { 2.159856, 1, 1.218750, 0 } }, { "Canon", "EOS 10D", "Shadow", 0, { 2.533654, 1, 1.036058, 0 } }, { "Canon", "EOS 10D", "Cloudy", 0, { 2.348558, 1, 1.116587, 0 } }, { "Canon", "EOS 10D", "Indescandent", 0, { 1.431544, 1, 1.851040, 0 } }, { "Canon", "EOS 10D", "Flourescent", 0, { 1.891509, 1, 1.647406, 0 } }, { "Canon", "EOS 10D", "Flash", 0, { 2.385817, 1, 1.115385, 0 } }, { "Canon", "EOS 20D", "Daylight", 0, { 1.954680, 1, 1.478818, 0 } }, { "Canon", "EOS 20D", "Shade", 0, { 2.248276, 1, 1.227586, 0 } }, { "Canon", "EOS 20D", "Cloudy", 0, { 2.115271, 1, 1.336946, 0 } }, { "Canon", "EOS 20D", "Tungsten", 0, { 1.368087, 1, 2.417044, 0 } }, { "Canon", "EOS 20D", "Fluorescent", 0, { 1.752709, 1, 2.060098, 0 } }, { "Canon", "EOS 20D", "Flash", 0, { 2.145813, 1, 1.293596, 0 } }, { "Canon", "EOS 300D DIGITAL", "Daylight", 0, { 2.13702, 1, 1.15745, 0 } }, { "Canon", "EOS 300D DIGITAL", "Cloudy", 0, { 2.50961, 1, 0.97716, 0 } }, { "Canon", "EOS 300D DIGITAL", "Tungsten", 0, { 2.32091, 1, 1.05529, 0 } }, { "Canon", "EOS 300D DIGITAL", "Flourescent", 0, { 1.39677, 1, 1.79892, 0 } }, { "Canon", "EOS 300D DIGITAL", "Flash", 0, { 1.84229, 1, 1.60573, 0 } }, { "Canon", "EOS 300D DIGITAL", "Shade", 0, { 2.13702, 1, 1.15745, 0 } }, { "Canon", "EOS 350D DIGITAL", "Tungsten", 0, { 1.554250, 1, 2.377034, 0 } }, { "Canon", "EOS 350D DIGITAL", "Daylight", 0, { 2.392927, 1, 1.487230, 0 } }, { "Canon", "EOS 350D DIGITAL", "Fluorescent", 0, { 1.999040, 1, 1.995202, 0 } }, { "Canon", "EOS 350D DIGITAL", "Shade", 0, { 2.827112, 1, 1.235756, 0 } }, { "Canon", "EOS 350D DIGITAL", "Flash", 0, { 2.715128, 1, 1.295678, 0 } }, { "Canon", "EOS 350D DIGITAL", "Cloudy", 0, { 2.611984, 1, 1.343811, 0 } }, { "Canon", "EOS DIGITAL REBEL", "Daylight", 0, { 2.13702, 1, 1.15745, 0 } }, { "Canon", "EOS DIGITAL REBEL", "Cloudy", 0, { 2.50961, 1, 0.97716, 0 } }, { "Canon", "EOS DIGITAL REBEL", "Tungsten", 0, { 2.32091, 1, 1.05529, 0 } }, { "Canon", "EOS DIGITAL REBEL", "Flourescent", 0, { 1.39677, 1, 1.79892, 0 } }, { "Canon", "EOS DIGITAL REBEL", "Flash", 0, { 1.84229, 1, 1.60573, 0 } }, { "Canon", "EOS DIGITAL REBEL", "Shade", 0, { 2.13702, 1, 1.15745, 0 } }, { "Canon", "EOS DIGITAL REBEL XT", "Tungsten", 0, { 1.554250, 1, 2.377034, 0 } }, { "Canon", "EOS DIGITAL REBEL XT", "Daylight", 0, { 2.392927, 1, 1.487230, 0 } }, { "Canon", "EOS DIGITAL REBEL XT", "Fluorescent", 0, { 1.999040, 1, 1.995202, 0 } }, { "Canon", "EOS DIGITAL REBEL XT", "Shade", 0, { 2.827112, 1, 1.235756, 0 } }, { "Canon", "EOS DIGITAL REBEL XT", "Flash", 0, { 2.715128, 1, 1.295678, 0 } }, { "Canon", "EOS DIGITAL REBEL XT", "Cloudy", 0, { 2.611984, 1, 1.343811, 0 } }, { "Canon", "EOS-1D Mark II", "Cloudy", 0, { 2.093750, 1, 1.166016, 0 } }, { "Canon", "EOS-1D Mark II", "Daylight", 0, { 1.957031, 1, 1.295898, 0 } }, { "Canon", "EOS-1D Mark II", "Flash", 0, { 2.225586, 1, 1.172852, 0 } }, { "Canon", "EOS-1D Mark II", "Fluorescent", 0, { 1.785853, 1, 1.785853, 0 } }, { "Canon", "EOS-1D Mark II", "Shade", 0, { 2.220703, 1, 1.069336, 0 } }, { "Canon", "EOS-1D Mark II", "Tungsten", 0, { 1.415480, 1, 2.160142, 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", "Direct sunlight", 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", "FinePix S7000", "Outdoor fine", 0, { 1.900000, 1, 1.525000, 0 } }, { "FUJIFILM", "FinePix S7000", "Shade", 0, { 2.137500, 1, 1.350000, 0 } }, { "FUJIFILM", "FinePix S7000", "Daylight fluorescent", 0, { 2.315217, 1, 1.347826, 0 } }, { "FUJIFILM", "FinePix S7000", "Warm White fluorescent", 0, { 1.902174, 1, 1.663043, 0 } }, { "FUJIFILM", "FinePix S7000", "Cool White fluorescent", 0, { 1.836957, 1, 2.130435, 0 } }, { "FUJIFILM", "FinePix S7000", "Incandescent", 0, { 1.221239, 1, 2.548673, 0 } }, { "LEICA", "DIGILUX 2", "Sunshine", 0, { 1.628906, 1, 1.488281, 0 } }, { "LEICA", "DIGILUX 2", "Cloudy", 0, { 1.835938, 1, 1.343750, 0 } }, { "LEICA", "DIGILUX 2", "Indoor Halogen", 0, { 1.078125, 1, 2.203125, 0 } }, { "LEICA", "DIGILUX 2", "Flash", 0, { 2.074219, 1, 1.304688, 0 } }, { "LEICA", "DIGILUX 2", "B/W", 0, { 1.632812, 1, 1.550781, 0 } }, { "Minolta", "DiMAGE 7Hi", "Daylight", 0, { 1.609375, 1, 1.328125, 0 } }, /* 5500K */ { "Minolta", "DiMAGE 7Hi", "Tungsten", 0, { 1, 1.137778, 2.768889, 0 } }, /* 2800K */ { "Minolta", "DiMAGE 7Hi", "Fluorescent 1", 0, { 1.664062, 1, 2.105469, 0 } }, /* 4060K*/ { "Minolta", "DiMAGE 7Hi", "Fluorescent 2", 0, { 1.796875, 1, 1.734375, 0 } }, /* 4938K */ { "Minolta", "DiMAGE 7Hi", "Cloudy", 0, { 1.730469, 1, 1.269531, 0 } }, /* 5823K */ { "Minolta", "DiMAGE A1", "Daylight", 0, { 1.808594, 1, 1.304688, 0 } }, { "Minolta", "DiMAGE A1", "Tungsten", 0, { 1.062500, 1, 2.675781, 0 } }, { "Minolta", "DiMAGE A1", "Fluorescent", 0, { 1.707031, 1, 2.039063, 0 } }, { "Minolta", "DiMAGE A1", "Cloudy", 0, { 1.960938, 1, 1.339844, 0 } }, { "Minolta", "DiMAGE A1", "Shade", 0, { 2.253906, 1, 1.199219, 0 } }, { "Minolta", "DiMAGE A1", "Shade", 2, { 2.000000, 1, 1.183594, 0 } }, { "Minolta", "DiMAGE A1", "Flash", 0, { 1.972656, 1, 1.265625, 0 } }, { "Minolta", "DiMAGE G500", "Sun", 0, { 1.496094, 1, 1.121094, 0 } }, { "Minolta", "DiMAGE G500", "Cloudy", 0, { 1.527344, 1, 1.105469, 0 } }, { "Minolta", "DiMAGE G500", "Luminescent", 0, { 1.382813, 1, 1.347656, 0 } }, { "Minolta", "DiMAGE G500", "Lamp", 0, { 1.042969, 1, 1.859375, 0 } }, { "MINOLTA", "DYNAX 5D", "Daylight", 0, { 1.660156, 1, 1.625000, 0 } }, { "MINOLTA", "DYNAX 5D", "Shade", 0, { 1.898438, 1, 1.421875, 0 } }, { "MINOLTA", "DYNAX 5D", "Cloudy", 0, { 1.777344, 1, 1.488281, 0 } }, { "MINOLTA", "DYNAX 5D", "Tungsten", 0, { 1.000000, 1, 3.626016, 0 } }, { "MINOLTA", "DYNAX 5D", "Fluorescent", 0, { 1.597656, 1, 2.496094, 0 } }, { "MINOLTA", "DYNAX 5D", "Flash", 0, { 1.812500, 1, 1.445312, 0 } }, { "MINOLTA", "DYNAX 7D", "Daylight", 0, { 1.621094, 1, 1.601562, 0 } }, { "MINOLTA", "DYNAX 7D", "Shade", 0, { 1.855469, 1, 1.402344, 0 } }, { "MINOLTA", "DYNAX 7D", "Cloudy", 0, { 1.738281, 1, 1.464844, 0 } }, { "MINOLTA", "DYNAX 7D", "Tungsten", 0, { 0.945312, 1, 3.292969, 0 } }, { "MINOLTA", "DYNAX 7D", "Fluorescent", 0, { 1.570312, 1, 2.453125, 0 } }, { "MINOLTA", "DYNAX 7D", "Flash", 0, { 1.890625, 1, 1.445312, 0 } }, { "NIKON", "D100", "Incandescent", 0, { 1.406250, 1, 2.828125, 0 } }, { "NIKON", "D100", "Fluorescent", 0, { 2.058594, 1, 2.617188, 0 } }, { "NIKON", "D100", "Sunlight", 0, { 2.257813, 1, 1.757813, 0 } }, { "NIKON", "D100", "Flash", 0, { 2.539063, 1, 1.539063, 0 } }, { "NIKON", "D100", "Overcast", 0, { 2.507813, 1, 1.628906, 0 } }, { "NIKON", "D100", "Shade", 0, { 2.906250, 1, 1.437500, 0 } }, /* * D2X with firmware A 1.01 and B 1.01 * D2X basic WB presets */ /* D2X fine tune presets (0 is basic, above) */ { "NIKON", "D2X", "Incandescent", -3, { 0.98462, 1, 2.61154, 0 } }, /* ~3300K */ { "NIKON", "D2X", "Incandescent", -2, { 0.95880, 1, 2.71536, 0 } }, /* ~3200K */ { "NIKON", "D2X", "Incandescent", -1, { 0.94465, 1, 2.77122, 0 } }, /* 3100K */ { "NIKON", "D2X", "Incandescent", 0, { 0.92086, 1, 2.89928, 0 } }, /* 3000K */ { "NIKON", "D2X", "Incandescent", 1, { 0.89510, 1, 3.03846, 0 } }, /* ~2900K */ { "NIKON", "D2X", "Incandescent", 2, { 0.86486, 1, 3.17905, 0 } }, /* 2800K */ { "NIKON", "D2X", "Incandescent", 3, { 0.83388, 1, 3.34528, 0 } }, /* 2700K */ { "NIKON", "D2X", "Fluorescent", -3, { 2.01562, 1, 1.72266, 0 } }, /* ~~7200K */ { "NIKON", "D2X", "Fluorescent", -2, { 1.67969, 1, 1.42578, 0 } }, /* ~~6500K */ { "NIKON", "D2X", "Fluorescent", -1, { 1.42969, 1, 1.80078, 0 } }, /* ~~5000K */ { "NIKON", "D2X", "Fluorescent", 0, { 1.42969, 1, 2.62891, 0 } }, /* ~~4200K */ { "NIKON", "D2X", "Fluorescent", 1, { 1.13672, 1, 3.02734, 0 } }, /* ~~3700K */ { "NIKON", "D2X", "Fluorescent", 2, { 0.94118, 1, 2.68498, 0 } }, /* ~~3000K */ { "NIKON", "D2X", "Fluorescent", 3, { 0.83388, 1, 3.51140, 0 } }, /* ~~2700K */ { "NIKON", "D2X", "Direct sunlight", -3, { 1.61328, 1, 1.61328, 0 } }, /* 5600K */ { "NIKON", "D2X", "Direct sunlight", -2, { 1.57031, 1, 1.65234, 0 } }, /* ~5400K */ { "NIKON", "D2X", "Direct sunlight", -1, { 1.55078, 1, 1.67578, 0 } }, /* 5300K */ { "NIKON", "D2X", "Direct sunlight", 0, { 1.52734, 1, 1.69531, 0 } }, /* ~5200K */ { "NIKON", "D2X", "Direct sunlight", 1, { 1.48438, 1, 1.74609, 0 } }, /* 5000K */ { "NIKON", "D2X", "Direct sunlight", 2, { 1.45312, 1, 1.76953, 0 } }, /* ~4900K */ { "NIKON", "D2X", "Direct sunlight", 3, { 1.42578, 1, 1.78906, 0 } }, /* 4800K */ { "NIKON", "D2X", "Flash", -3, { 1.71484, 1, 1.48438, 0 } }, /* ~~6000K */ { "NIKON", "D2X", "Flash", -2, { 1.67578, 1, 1.48438, 0 } }, /* ~~5800K */ { "NIKON", "D2X", "Flash", -1, { 1.66797, 1, 1.50781, 0 } }, /* ~~5600K */ { "NIKON", "D2X", "Flash", 0, { 1.66016, 1, 1.53125, 0 } }, /* ~5400K */ { "NIKON", "D2X", "Flash", 1, { 1.64453, 1, 1.54297, 0 } }, /* ~~5200K */ { "NIKON", "D2X", "Flash", 2, { 1.62891, 1, 1.54297, 0 } }, /* ~~5000K */ { "NIKON", "D2X", "Flash", 3, { 1.57031, 1, 1.56641, 0 } }, /* ~~4800K */ { "NIKON", "D2X", "Cloudy", -3, { 1.79297, 1, 1.46875, 0 } }, /* ~6600K */ { "NIKON", "D2X", "Cloudy", -2, { 1.76172, 1, 1.49219, 0 } }, /* ~6400K */ { "NIKON", "D2X", "Cloudy", -1, { 1.72656, 1, 1.51953, 0 } }, /* ~6200K */ { "NIKON", "D2X", "Cloudy", 0, { 1.69141, 1, 1.54688, 0 } }, /* ~6000K */ { "NIKON", "D2X", "Cloudy", 1, { 1.65234, 1, 1.57812, 0 } }, /* ~5800K */ { "NIKON", "D2X", "Cloudy", 2, { 1.61328, 1, 1.61328, 0 } }, /* 5600K */ { "NIKON", "D2X", "Cloudy", 3, { 1.57031, 1, 1.65234, 0 } }, /* ~5400K */ { "NIKON", "D2X", "Shade", -3, { 2.10938, 1, 1.23828, 0 } }, /* ~9200K */ { "NIKON", "D2X", "Shade", -2, { 2.07031, 1, 1.26562, 0 } }, /* ~8800K */ { "NIKON", "D2X", "Shade", -1, { 2.02734, 1, 1.29688, 0 } }, /* ~8400K */ { "NIKON", "D2X", "Shade", 0, { 1.98047, 1, 1.32812, 0 } }, /* ~8000K */ { "NIKON", "D2X", "Shade", 1, { 1.92188, 1, 1.37109, 0 } }, /* ~7500K */ { "NIKON", "D2X", "Shade", 2, { 1.86719, 1, 1.41406, 0 } }, /* 7100K */ { "NIKON", "D2X", "Shade", 3, { 1.80859, 1, 1.45703, 0 } }, /* 6700K */ /* D2X Kelvin presets */ { "NIKON", "D2X", "2500K", 0, { 0.74203, 1, 3.67536, 0 } }, { "NIKON", "D2X", "2550K", 0, { 0.76877, 1, 3.58859, 0 } }, { "NIKON", "D2X", "2650K", 0, { 0.81529, 1, 3.42675, 0 } }, { "NIKON", "D2X", "2700K", 0, { 0.83388, 1, 3.34528, 0 } }, { "NIKON", "D2X", "2800K", 0, { 0.86486, 1, 3.17905, 0 } }, { "NIKON", "D2X", "2850K", 0, { 0.87973, 1, 3.10309, 0 } }, { "NIKON", "D2X", "2950K", 0, { 0.90780, 1, 2.96454, 0 } }, { "NIKON", "D2X", "3000K", 0, { 0.92086, 1, 2.89928, 0 } }, { "NIKON", "D2X", "3100K", 0, { 0.94465, 1, 2.77122, 0 } }, { "NIKON", "D2X", "3200K", 0, { 0.96970, 1, 2.65530, 0 } }, { "NIKON", "D2X", "3300K", 0, { 0.99611, 1, 2.55642, 0 } }, { "NIKON", "D2X", "3400K", 0, { 1.01953, 1, 2.46484, 0 } }, { "NIKON", "D2X", "3600K", 0, { 1.07422, 1, 2.34375, 0 } }, { "NIKON", "D2X", "3700K", 0, { 1.09766, 1, 2.26172, 0 } }, { "NIKON", "D2X", "3800K", 0, { 1.12500, 1, 2.18750, 0 } }, { "NIKON", "D2X", "4000K", 0, { 1.17969, 1, 2.06250, 0 } }, { "NIKON", "D2X", "4200K", 0, { 1.24219, 1, 1.96094, 0 } }, { "NIKON", "D2X", "4300K", 0, { 1.27344, 1, 1.91797, 0 } }, { "NIKON", "D2X", "4500K", 0, { 1.33594, 1, 1.83984, 0 } }, { "NIKON", "D2X", "4800K", 0, { 1.42578, 1, 1.78906, 0 } }, { "NIKON", "D2X", "5000K", 0, { 1.48438, 1, 1.74609, 0 } }, { "NIKON", "D2X", "5300K", 0, { 1.55078, 1, 1.67578, 0 } }, { "NIKON", "D2X", "5600K", 0, { 1.61328, 1, 1.61328, 0 } }, { "NIKON", "D2X", "5900K", 0, { 1.67188, 1, 1.56250, 0 } }, { "NIKON", "D2X", "6300K", 0, { 1.74219, 1, 1.50391, 0 } }, { "NIKON", "D2X", "6700K", 0, { 1.80859, 1, 1.45703, 0 } }, { "NIKON", "D2X", "7100K", 0, { 1.86719, 1, 1.41406, 0 } }, { "NIKON", "D2X", "7700K", 0, { 1.94531, 1, 1.35547, 0 } }, { "NIKON", "D2X", "8300K", 0, { 2.01562, 1, 1.30469, 0 } }, { "NIKON", "D2X", "9100K", 0, { 2.09766, 1, 1.24609, 0 } }, { "NIKON", "D2X", "10000K", 0, { 2.17578, 1, 1.18359, 0 } }, /* D200 basic WB presets */ { "NIKON", "D200", "Incandescent", 0, { 1.148438, 1, 2.398438, 0 } }, { "NIKON", "D200", "Fluorescent", 0, { 1.664063, 1, 2.148438, 0 } }, { "NIKON", "D200", "Sunlight", 0, { 1.804688, 1, 1.398438, 0 } }, { "NIKON", "D200", "Flash", 0, { 2.007813, 1, 1.171875, 0 } }, { "NIKON", "D200", "Overcast", 0, { 1.917969, 1, 1.261719, 0 } }, { "NIKON", "D200", "Shade", 0, { 2.234375, 1, 1.125000, 0 } }, /* D200 Kelvin presets */ { "NIKON", "D200", "2500K", 0, { 1, 1, 3.121094, 0 } }, { "NIKON", "D200", "2550K", 0, { 1, 1, 3.035156, 0 } }, { "NIKON", "D200", "2650K", 0, { 1.011719, 1, 2.878906, 0 } }, { "NIKON", "D200", "2700K", 0, { 1.031250, 1, 2.804688, 0 } }, { "NIKON", "D200", "2800K", 0, { 1.074219, 1, 2.648438, 0 } }, { "NIKON", "D200", "2850K", 0, { 1.089844, 1, 2.589844, 0 } }, { "NIKON", "D200", "2950K", 0, { 1.132813, 1, 2.453125, 0 } }, { "NIKON", "D200", "3000K", 0, { 1.148438, 1, 2.398438, 0 } }, { "NIKON", "D200", "3100K", 0, { 1.183594, 1, 2.289063, 0 } }, { "NIKON", "D200", "3200K", 0, { 1.218750, 1, 2.187500, 0 } }, { "NIKON", "D200", "3300K", 0, { 1.250000, 1, 2.097656, 0 } }, { "NIKON", "D200", "3400K", 0, { 1.281250, 1, 2.015625, 0 } }, { "NIKON", "D200", "3600K", 0, { 1.343750, 1, 1.871094, 0 } }, { "NIKON", "D200", "3700K", 0, { 1.371094, 1, 1.820313, 0 } }, { "NIKON", "D200", "3800K", 0, { 1.402344, 1, 1.761719, 0 } }, { "NIKON", "D200", "4000K", 0, { 1.457031, 1, 1.667969, 0 } }, { "NIKON", "D200", "4200K", 0, { 1.511719, 1, 1.593750, 0 } }, { "NIKON", "D200", "4300K", 0, { 1.535156, 1, 1.558594, 0 } }, { "NIKON", "D200", "4500K", 0, { 1.589844, 1, 1.500000, 0 } }, { "NIKON", "D200", "4800K", 0, { 1.687500, 1, 1.449219, 0 } }, { "NIKON", "D200", "5000K", 0, { 1.746094, 1, 1.425781, 0 } }, { "NIKON", "D200", "5300K", 0, { 1.820313, 1, 1.375000, 0 } }, { "NIKON", "D200", "5600K", 0, { 1.863281, 1, 1.320313, 0 } }, { "NIKON", "D200", "5900K", 0, { 1.902344, 1, 1.273438, 0 } }, { "NIKON", "D200", "6300K", 0, { 1.972656, 1, 1.234375, 0 } }, { "NIKON", "D200", "6700K", 0, { 2.046875, 1, 1.199219, 0 } }, { "NIKON", "D200", "7100K", 0, { 2.105469, 1, 1.175781, 0 } }, { "NIKON", "D200", "7700K", 0, { 2.191406, 1, 1.144531, 0 } }, { "NIKON", "D200", "8300K", 0, { 2.277344, 1, 1.109375, 0 } }, { "NIKON", "D200", "9300K", 0, { 2.367188, 1, 1.070313, 0 } }, { "NIKON", "D200", "10000K", 0, { 2.453125, 1, 1.035156, 0 } }, { "NIKON", "D50", "Incandescent", 0, { 1.328125, 1, 2.500000, 0 } }, { "NIKON", "D50", "Fluorescent", 0, { 1.945312, 1, 2.191406, 0 } }, { "NIKON", "D50", "Sunny", 0, { 2.140625, 1, 1.398438, 0 } }, { "NIKON", "D50", "Flash", 0, { 2.398438, 1, 1.339844, 0 } }, { "NIKON", "D50", "Shade", 0, { 2.746094, 1, 1.156250, 0 } }, { "NIKON", "D70", "Incandescent", 0, { 1.343750, 1, 2.816406, 0 } }, /* 3000K */ { "NIKON", "D70", "Fluorescent", 0, { 1.964844, 1, 2.476563, 0 } }, /* 4200K */ { "NIKON", "D70", "Direct sunlight", 0, { 2.062500, 1, 1.597656, 0 } }, /* 5200K*/ { "NIKON", "D70", "Flash", 0, { 2.441406, 1, 1.500000, 0 } }, /* 5400K */ { "NIKON", "D70", "Cloudy", 0, { 2.257813, 1, 1.457031, 0 } }, /* 6000K */ { "NIKON", "D70", "Shade", 0, { 2.613281, 1, 1.277344, 0 } }, /* 8000K */ { "OLYMPUS", "E-1", "3000K Tungsten", 0, { 1, 1.024000, 1.992000, 0 } }, { "OLYMPUS", "E-1", "3300K", 0, { 1.070312, 1, 1.773438, 0 } }, { "OLYMPUS", "E-1", "3600K Incandescent", 0, { 1.156250, 1, 1.640625, 0 } }, { "OLYMPUS", "E-1", "3900K", 0, { 1.234375, 1, 1.523438, 0 } }, { "OLYMPUS", "E-1", "4000K White fluorescent", 0, { 2.062500, 1, 1.679688, 0 } }, { "OLYMPUS", "E-1", "4300K", 0, { 1.414062, 1, 1.343750, 0 } }, { "OLYMPUS", "E-1", "4500K Neutral fluorescent", 0, { 1.835938, 1, 1.320312, 0 } }, { "OLYMPUS", "E-1", "4800K", 0, { 1.546875, 1, 1.226562, 0 } }, { "OLYMPUS", "E-1", "5300K Clear day", 0, { 1.664062, 1, 1.140625, 0 } }, { "OLYMPUS", "E-1", "6000K Cloudy (with flash)", 0, { 1.796875, 1, 1.046875, 0 } }, { "OLYMPUS", "E-1", "6600K Daylight fluorescent", 0, { 2.101562, 1, 1.085938, 0 } }, { "OLYMPUS", "E-1", "7500K Shadows", 0, { 2.196581, 1.094017, 1, 0 } }, { "OLYMPUS", "E-10", "3000K Incandescent", 0, { 1, 1.153153, 3.441442, 0 } }, { "OLYMPUS", "E-10", "3700K Incandescent (mood)", 0, { 1.101562, 1, 2.351562, 0 } }, { "OLYMPUS", "E-10", "4000K White fluorescent", 0, { 1.460938, 1, 2.546875, 0 } }, { "OLYMPUS", "E-10", "4500K Daylight fluorescent", 0, { 1.460938, 1, 1.843750, 0 } }, { "OLYMPUS", "E-10", "5500K Clear day", 0, { 1.523438, 1, 1.617188, 0 } }, { "OLYMPUS", "E-10", "6500K Cloudy day", 0, { 1.687500, 1, 1.437500, 0 } }, { "OLYMPUS", "E-10", "7500K Shadows", 0, { 1.812500, 1, 1.312500, 0 } }, { "Panasonic", "DMC-FZ30", "Sunny", 0, { 1.757576, 1, 1.446970, 0 } }, { "Panasonic", "DMC-FZ30", "Cloudy", 0, { 1.943182, 1, 1.276515, 0 } }, { "Panasonic", "DMC-FZ30", "Fluorescent", 0, { 1.098485, 1, 2.106061, 0 } }, { "Panasonic", "DMC-FZ30", "Flash", 0, { 1.965909, 1, 1.303030, 0 } }, { "PENTAX", "*ist DS", "Daylight", 0, { 1.632812, 1, 1, 0 } }, { "PENTAX", "*ist DS", "Shade", 0, { 1.964844, 1, 1, 0 } }, { "PENTAX", "*ist DS", "Cloudy", 0, { 1.761719, 1, 1, 0 } }, { "PENTAX", "*ist DS", "Daylight colors fluorescent", 0, { 1.910156, 1, 1, 0 } }, { "PENTAX", "*ist DS", "Daylight white fluorescent", 0, { 1.521569, 1.003922, 1, 0 } }, { "PENTAX", "*ist DS", "White light fluorescent", 0, { 1.496094, 1, 1.023438, 0 } }, { "PENTAX", "*ist DS", "Tungsten", 0, { 1, 1, 2.027344, 0 } }, { "PENTAX", "*ist DS", "Flash", 0, { 1.695312, 1, 1, 0 } }, }; const int wb_preset_count = sizeof(wb_preset) / sizeof(wb_data); Index: ufraw_routines.c =================================================================== RCS file: /cvsroot/ufraw/ufraw/ufraw_routines.c,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** ufraw_routines.c 19 Feb 2006 17:47:43 -0000 1.50 --- ufraw_routines.c 21 Feb 2006 00:05:30 -0000 1.51 *************** *** 96,436 **** } - /* The first column is the "make" of the camera, the - second is the "model". Use the "make" and "model" as provided - by DCRaw */ - const wb_data wb_preset[] = { - - { "", "", "Manual WB", { 0, 0, 0, 0} }, - { "", "", "Camera WB", { 0, 0, 0, 0} }, - { "", "", "Auto WB", { 0, 0, 0, 0} }, - - { "Canon", "PowerShot G2", "Daylight", { 2.011483, 1, 1.299522, 0 } }, - { "Canon", "PowerShot G2", "Cloudy", { 2.032505, 1, 1.285851, 0 } }, - { "Canon", "PowerShot G2", "Tungsten", { 1.976008, 1, 1.332054, 0 } }, - { "Canon", "PowerShot G2", "Fluorescent", { 2.022010, 1, 1.295694, 0 } }, - { "Canon", "PowerShot G2", "Daylight Fluorescent", { 2.029637, 1, 1.286807, 0 } }, - { "Canon", "PowerShot G2", "Flash", { 2.153576, 1, 1.140680, 0 } }, - - { "Canon", "PowerShot G5", "Daylight", { 1.639521, 1, 1.528144, 0 } }, - { "Canon", "PowerShot G5", "Cloudy", { 1.702153, 1, 1.462919, 0 } }, - { "Canon", "PowerShot G5", "Tungsten", { 1.135071, 1, 2.374408, 0 } }, - { "Canon", "PowerShot G5", "Fluorescent", { 1.660281, 1, 2.186462, 0 } }, - { "Canon", "PowerShot G5", "Daylight Fluorescent", { 1.463297, 1, 1.764140, 0 } }, - { "Canon", "PowerShot G5", "Flash", { 1.603593, 1, 1.562874, 0 } }, - - { "Canon", "PowerShot G6", "Daylight", { 1.769704, 1, 1.637931, 0 } }, - { "Canon", "PowerShot G6", "Cloudy", { 2.062731, 1, 1.442804, 0 } }, - { "Canon", "PowerShot G6", "Tungsten", { 1.077106, 1, 2.721234, 0 } }, - { "Canon", "PowerShot G6", "Fluorescent", { 1.914922, 1, 2.142670, 0 } }, - { "Canon", "PowerShot G6", "Fluorescent H", { 2.543677, 1, 1.650587, 0 } }, - { "Canon", "PowerShot G6", "Flash", { 2.285322, 1, 1.333333, 0 } }, - - { "Canon", "PowerShot S50", "Daylight", { 1.772506, 1, 1.536496, 0 } }, - { "Canon", "PowerShot S50", "Cloudy", { 1.831311, 1, 1.484223, 0 } }, - { "Canon", "PowerShot S50", "Tungsten", { 1.185542, 1, 2.480723, 0 } }, - { "Canon", "PowerShot S50", "Fluorescent", { 1.706410, 1, 2.160256, 0 } }, - { "Canon", "PowerShot S50", "Fluorescent H", { 1.562500, 1, 1.817402, 0 } }, - { "Canon", "PowerShot S50", "Flash", { 1.776156, 1, 1.531630, 0 } }, - - { "Canon", "PowerShot S60", "Daylight", { 1.742169, 1, 1.486747, 0 } }, - { "Canon", "PowerShot S60", "Cloudy", { 1.881437, 1, 1.366467, 0 } }, - { "Canon", "PowerShot S60", "Tungsten", { 1.144910, 1, 2.566467, 0 } }, - { "Canon", "PowerShot S60", "Fluorescent", { 1.714650, 1, 2.053503, 0 } }, - { "Canon", "PowerShot S60", "Fluorescent H", { 2.849655, 1, 2.067586, 0 } }, - { "Canon", "PowerShot S60", "Flash", { 2.143229, 1, 1.190104, 0 } }, - { "Canon", "PowerShot S60", "Underwater", { 2.677109, 1, 1.148193, 0 } }, - - { "Canon", "PowerShot S70", "Daylight", { 1.943834, 1, 1.456654, 0 } }, - { "Canon", "PowerShot S70", "Cloudy", { 2.049939, 1, 1.382460, 0 } }, - { "Canon", "PowerShot S70", "Tungsten", { 1.169492, 1, 2.654964, 0 } }, - { "Canon", "PowerShot S70", "Fluorescent", { 1.993456, 1, 2.056283, 0 } }, - { "Canon", "PowerShot S70", "Fluorescent H", { 2.645914, 1, 1.565499, 0 } }, - { "Canon", "PowerShot S70", "Flash", { 2.389189, 1, 1.147297, 0 } }, - { "Canon", "PowerShot S70", "Underwater", { 3.110565, 1, 1.162162, 0 } }, - - { "Canon", "EOS 10D", "Sunlight", { 2.159856, 1, 1.218750, 0 } }, - { "Canon", "EOS 10D", "Shadow", { 2.533654, 1, 1.036058, 0 } }, - { "Canon", "EOS 10D", "Cloudy", { 2.348558, 1, 1.116587, 0 } }, - { "Canon", "EOS 10D", "Indescandent", { 1.431544, 1, 1.851040, 0 } }, - { "Canon", "EOS 10D", "Flourescent", { 1.891509, 1, 1.647406, 0 } }, - { "Canon", "EOS 10D", "Flash", { 2.385817, 1, 1.115385, 0 } }, - - { "Canon", "EOS 20D", "Daylight", { 1.954680, 1, 1.478818, 0} }, - { "Canon", "EOS 20D", "Shade", { 2.248276, 1, 1.227586, 0} }, - { "Canon", "EOS 20D", "Cloudy", { 2.115271, 1, 1.336946, 0} }, - { "Canon", "EOS 20D", "Tungsten", { 1.368087, 1, 2.417044, 0} }, - { "Canon", "EOS 20D", "Fluorescent", { 1.752709, 1, 2.060098, 0} }, - { "Canon", "EOS 20D", "Flash", { 2.145813, 1, 1.293596, 0} }, - - { "Canon", "EOS 300D DIGITAL", "Daylight", { 2.13702, 1, 1.15745, 0 } }, - { "Canon", "EOS 300D DIGITAL", "Cloudy", { 2.50961, 1, 0.97716, 0 } }, - { "Canon", "EOS 300D DIGITAL", "Tungsten", { 2.32091, 1, 1.05529, 0 } }, - { "Canon", "EOS 300D DIGITAL", "Flourescent", { 1.39677, 1, 1.79892, 0 } }, - { "Canon", "EOS 300D DIGITAL", "Flash", { 1.84229, 1, 1.60573, 0 } }, - { "Canon", "EOS 300D DIGITAL", "Shade", { 2.13702, 1, 1.15745, 0 } }, - - { "Canon", "EOS 350D DIGITAL", "Tungsten", { 1.554250, 1, 2.377034, 0 } }, - { "Canon", "EOS 350D DIGITAL", "Daylight", { 2.392927, 1, 1.487230, 0 } }, - { "Canon", "EOS 350D DIGITAL", "Fluorescent", { 1.999040, 1, 1.995202, 0 } }, - { "Canon", "EOS 350D DIGITAL", "Shade", { 2.827112, 1, 1.235756, 0 } }, - { "Canon", "EOS 350D DIGITAL", "Flash", { 2.715128, 1, 1.295678, 0 } }, - { "Canon", "EOS 350D DIGITAL", "Cloudy", { 2.611984, 1, 1.343811, 0 } }, - - { "Canon", "EOS DIGITAL REBEL", "Daylight", { 2.13702, 1, 1.15745, 0 } }, - { "Canon", "EOS DIGITAL REBEL", "Cloudy", { 2.50961, 1, 0.97716, 0 } }, - { "Canon", "EOS DIGITAL REBEL", "Tungsten", { 2.32091, 1, 1.05529, 0 } }, - { "Canon", "EOS DIGITAL REBEL", "Flourescent", { 1.39677, 1, 1.79892, 0 } }, - { "Canon", "EOS DIGITAL REBEL", "Flash", { 1.84229, 1, 1.60573, 0 } }, - { "Canon", "EOS DIGITAL REBEL", "Shade", { 2.13702, 1, 1.15745, 0 } }, - - { "Canon", "EOS DIGITAL REBEL XT", "Tungsten", { 1.554250, 1, 2.377034, 0 } }, - { "Canon", "EOS DIGITAL REBEL XT", "Daylight", { 2.392927, 1, 1.487230, 0 } }, - { "Canon", "EOS DIGITAL REBEL XT", "Fluorescent", { 1.999040, 1, 1.995202, 0 } }, - { "Canon", "EOS DIGITAL REBEL XT", "Shade", { 2.827112, 1, 1.235756, 0 } }, - { "Canon", "EOS DIGITAL REBEL XT", "Flash", { 2.715128, 1, 1.295678, 0 } }, - { "Canon", "EOS DIGITAL REBEL XT", "Cloudy", { 2.611984, 1, 1.343811, 0 } }, - - { "Canon", "EOS-1D Mark II", "Cloudy", { 2.093750, 1, 1.166016, 0} }, - { "Canon", "EOS-1D Mark II", "Daylight", { 1.957031, 1, 1.295898, 0} }, - { "Canon", "EOS-1D Mark II", "Flash", { 2.225586, 1, 1.172852, 0} }, - { "Canon", "EOS-1D Mark II", "Fluorescent", { 1.785853, 1, 1.785853, 0} }, - { "Canon", "EOS-1D Mark II", "Shade", { 2.220703, 1, 1.069336, 0} }, - { "Canon", "EOS-1D Mark II", "Tungsten", { 1.415480, 1, 2.160142, 0} }, - - { "FUJIFILM", "FinePix S5000", "Incandescent", { 1.212081, 1, 2.672364, 0 } }, - { "FUJIFILM", "FinePix S5000", "Fluorescent", { 1.772316, 1, 2.349902, 0 } }, - { "FUJIFILM", "FinePix S5000", "Direct sunlight", { 1.860403, 1, 1.515946, 0 } }, - { "FUJIFILM", "FinePix S5000", "Flash", { 2.202181, 1, 1.423284, 0 } }, - { "FUJIFILM", "FinePix S5000", "Cloudy", { 2.036578, 1, 1.382513, 0 } }, - { "FUJIFILM", "FinePix S5000", "Shade", { 2.357215, 1, 1.212016, 0 } }, - - { "FUJIFILM", "FinePix S7000", "Outdoor fine", { 1.900000, 1, 1.525000, 0 } }, - { "FUJIFILM", "FinePix S7000", "Shade", { 2.137500, 1, 1.350000, 0 } }, - { "FUJIFILM", "FinePix S7000", "Daylight fluorescent", { 2.315217, 1, 1.347826, 0 } }, - { "FUJIFILM", "FinePix S7000", "Warm White fluorescent", { 1.902174, 1, 1.663043, 0 } }, - { "FUJIFILM", "FinePix S7000", "Cool White fluorescent", { 1.836957, 1, 2.130435, 0 } }, - { "FUJIFILM", "FinePix S7000", "Incandescent", { 1.221239, 1, 2.548673, 0 } }, - - { "LEICA", "DIGILUX 2", "Sunshine", { 1.628906, 1, 1.488281, 0 } }, - { "LEICA", "DIGILUX 2", "Cloudy", { 1.835938, 1, 1.343750, 0 } }, - { "LEICA", "DIGILUX 2", "Indoor Halogen", { 1.078125, 1, 2.203125, 0 } }, - { "LEICA", "DIGILUX 2", "Flash", { 2.074219, 1, 1.304688, 0 } }, - { "LEICA", "DIGILUX 2", "B/W", { 1.632812, 1, 1.550781, 0 } }, - - { "Minolta", "DiMAGE 7Hi", "Daylight", { 1.609375, 1, 1.328125, 0 } }, /* 5500K */ - { "Minolta", "DiMAGE 7Hi", "Tungsten", { 1, 1.137778, 2.768889, 0 } }, /* 2800K */ - { "Minolta", "DiMAGE 7Hi", "Fluorescent 1", { 1.664062, 1, 2.105469, 0 } }, /* 4060K*/ - { "Minolta", "DiMAGE 7Hi", "Fluorescent 2", { 1.796875, 1, 1.734375, 0 } }, /* 4938K */ - { "Minolta", "DiMAGE 7Hi", "Cloudy", { 1.730469, 1, 1.269531, 0 } }, /* 5823K */ - - { "Minolta", "DiMAGE A1", "Daylight", { 1.808594, 1, 1.304688, 0 } }, - { "Minolta", "DiMAGE A1", "Tungsten", { 1.062500, 1, 2.675781, 0 } }, - { "Minolta", "DiMAGE A1", "Fluorescent", { 1.707031, 1, 2.039063, 0 } }, - { "Minolta", "DiMAGE A1", "Cloudy", { 1.960938, 1, 1.339844, 0 } }, - { "Minolta", "DiMAGE A1", "Shade", { 2.253906, 1, 1.199219, 0 } }, - { "Minolta", "DiMAGE A1", "Shade + 2", { 2.000000, 1, 1.183594, 0 } }, - { "Minolta", "DiMAGE A1", "Flash", { 1.972656, 1, 1.265625, 0 } }, - - { "Minolta", "DiMAGE G500", "Sun", { 1.496094, 1, 1.121094, 0 } }, - { "Minolta", "DiMAGE G500", "Cloudy", { 1.527344, 1, 1.105469, 0 } }, - { "Minolta", "DiMAGE G500", "Luminescent", { 1.382813, 1, 1.347656, 0 } }, - { "Minolta", "DiMAGE G500", "Lamp", { 1.042969, 1, 1.859375, 0 } }, - - { "MINOLTA", "DYNAX 5D", "Daylight", { 1.660156, 1, 1.625000, 0 } }, - { "MINOLTA", "DYNAX 5D", "Shade", { 1.898438, 1, 1.421875, 0 } }, - { "MINOLTA", "DYNAX 5D", "Cloudy", { 1.777344, 1, 1.488281, 0 } }, - { "MINOLTA", "DYNAX 5D", "Tungsten", { 1.000000, 1, 3.626016, 0 } }, - { "MINOLTA", "DYNAX 5D", "Fluorescent", { 1.597656, 1, 2.496094, 0 } }, - { "MINOLTA", "DYNAX 5D", "Flash", { 1.812500, 1, 1.445312, 0 } }, - - { "MINOLTA", "DYNAX 7D", "Daylight", { 1.621094, 1, 1.601562, 0} }, - { "MINOLTA", "DYNAX 7D", "Shade", { 1.855469, 1, 1.402344, 0} }, - { "MINOLTA", "DYNAX 7D", "Cloudy", { 1.738281, 1, 1.464844, 0} }, - { "MINOLTA", "DYNAX 7D", "Tungsten", { 0.945312, 1, 3.292969, 0} }, - { "MINOLTA", "DYNAX 7D", "Fluorescent", { 1.570312, 1, 2.453125, 0} }, - { "MINOLTA", "DYNAX 7D", "Flash", { 1.890625, 1, 1.445312, 0} }, - - { "NIKON", "D100", "Incandescent", { 1.406250, 1, 2.828125, 0 } }, - { "NIKON", "D100", "Fluorescent", { 2.058594, 1, 2.617188, 0 } }, - { "NIKON", "D100", "Sunlight", { 2.257813, 1, 1.757813, 0 } }, - { "NIKON", "D100", "Flash", { 2.539063, 1, 1.539063, 0 } }, - { "NIKON", "D100", "Overcast", { 2.507813, 1, 1.628906, 0 } }, - { "NIKON", "D100", "Shade", { 2.906250, 1, 1.437500, 0 } }, - - /* - * D2X with firmware A 1.01 and B 1.01 - * D2X basic WB presets - */ - { "NIKON", "D2X", "Incandescent", { 0.92086, 1, 2.89928, 0 } }, /* 3000K */ - { "NIKON", "D2X", "Fluorescent", { 1.42969, 1, 2.62891, 0 } }, /* ~~4200K */ - { "NIKON", "D2X", "Direct sunlight", { 1.52734, 1, 1.69531, 0 } }, /* ~5200K */ - { "NIKON", "D2X", "Flash", { 1.66016, 1, 1.53125, 0 } }, /* ~5400K */ - { "NIKON", "D2X", "Cloudy", { 1.69141, 1, 1.54688, 0 } }, /* ~6000K */ - { "NIKON", "D2X", "Shade", { 1.98047, 1, 1.32812, 0 } }, /* ~8000K */ - - /* D2X fine tune presets (0 is basic, above) */ - { "NIKON", "D2X", "Incandescent -3", { 0.98462, 1, 2.61154, 0 } }, /* ~3300K */ - { "NIKON", "D2X", "Incandescent -2", { 0.95880, 1, 2.71536, 0 } }, /* ~3200K */ - { "NIKON", "D2X", "Incandescent -1", { 0.94465, 1, 2.77122, 0 } }, /* 3100K */ - { "NIKON", "D2X", "Incandescent +1", { 0.89510, 1, 3.03846, 0 } }, /* ~2900K */ - { "NIKON", "D2X", "Incandescent +2", { 0.86486, 1, 3.17905, 0 } }, /* 2800K */ - { "NIKON", "D2X", "Incandescent +3", { 0.83388, 1, 3.34528, 0 } }, /* 2700K */ - { "NIKON", "D2X", "Fluorescent -3", { 2.01562, 1, 1.72266, 0 } }, /* ~~7200K */ - { "NIKON", "D2X", "Fluorescent -2", { 1.67969, 1, 1.42578, 0 } }, /* ~~6500K */ - { "NIKON", "D2X", "Fluorescent -1", { 1.42969, 1, 1.80078, 0 } }, /* ~~5000K */ - { "NIKON", "D2X", "Fluorescent +1", { 1.13672, 1, 3.02734, 0 } }, /* ~~3700K */ - { "NIKON", "D2X", "Fluorescent +2", { 0.94118, 1, 2.68498, 0 } }, /* ~~3000K */ - { "NIKON", "D2X", "Fluorescent +3", { 0.83388, 1, 3.51140, 0 } }, /* ~~2700K */ - { "NIKON", "D2X", "Direct sunlight -3", { 1.61328, 1, 1.61328, 0 } }, /* 5600K */ - { "NIKON", "D2X", "Direct sunlight -2", { 1.57031, 1, 1.65234, 0 } }, /* ~5400K */ - { "NIKON", "D2X", "Direct sunlight -1", { 1.55078, 1, 1.67578, 0 } }, /* 5300K */ - { "NIKON", "D2X", "Direct sunlight +1", { 1.48438, 1, 1.74609, 0 } }, /* 5000K */ - { "NIKON", "D2X", "Direct sunlight +2", { 1.45312, 1, 1.76953, 0 } }, /* ~4900K */ - { "NIKON", "D2X", "Direct sunlight +3", { 1.42578, 1, 1.78906, 0 } }, /* 4800K */ - { "NIKON", "D2X", "Flash -3", { 1.71484, 1, 1.48438, 0 } }, /* ~~6000K */ - { "NIKON", "D2X", "Flash -2", { 1.67578, 1, 1.48438, 0 } }, /* ~~5800K */ - { "NIKON", "D2X", "Flash -1", { 1.66797, 1, 1.50781, 0 } }, /* ~~5600K */ - { "NIKON", "D2X", "Flash +1", { 1.64453, 1, 1.54297, 0 } }, /* ~~5200K */ - { "NIKON", "D2X", "Flash +2", { 1.62891, 1, 1.54297, 0 } }, /* ~~5000K */ - { "NIKON", "D2X", "Flash +3", { 1.57031, 1, 1.56641, 0 } }, /* ~~4800K */ - { "NIKON", "D2X", "Cloudy -3", { 1.79297, 1, 1.46875, 0 } }, /* ~6600K */ - { "NIKON", "D2X", "Cloudy -2", { 1.76172, 1, 1.49219, 0 } }, /* ~6400K */ - { "NIKON", "D2X", "Cloudy -1", { 1.72656, 1, 1.51953, 0 } }, /* ~6200K */ - { "NIKON", "D2X", "Cloudy +1", { 1.65234, 1, 1.57812, 0 } }, /* ~5800K */ - { "NIKON", "D2X", "Cloudy +2", { 1.61328, 1, 1.61328, 0 } }, /* 5600K */ - { "NIKON", "D2X", "Cloudy +3", { 1.57031, 1, 1.65234, 0 } }, /* ~5400K */ - { "NIKON", "D2X", "Shade -3", { 2.10938, 1, 1.23828, 0 } }, /* ~9200K */ - { "NIKON", "D2X", "Shade -2", { 2.07031, 1, 1.26562, 0 } }, /* ~8800K */ - { "NIKON", "D2X", "Shade -1", { 2.02734, 1, 1.29688, 0 } }, /* ~8400K */ - { "NIKON", "D2X", "Shade +1", { 1.92188, 1, 1.37109, 0 } }, /* ~7500K */ - { "NIKON", "D2X", "Shade +2", { 1.86719, 1, 1.41406, 0 } }, /* 7100K */ - { "NIKON", "D2X", "Shade +3", { 1.80859, 1, 1.45703, 0 } }, /* 6700K */ - - /* D2X Kelvin presets */ - { "NIKON", "D2X", "2500K", { 0.74203, 1, 3.67536, 0 } }, - { "NIKON", "D2X", "2550K", { 0.76877, 1, 3.58859, 0 } }, - { "NIKON", "D2X", "2650K", { 0.81529, 1, 3.42675, 0 } }, - { "NIKON", "D2X", "2700K", { 0.83388, 1, 3.34528, 0 } }, - { "NIKON", "D2X", "2800K", { 0.86486, 1, 3.17905, 0 } }, - { "NIKON", "D2X", "2850K", { 0.87973, 1, 3.10309, 0 } }, - { "NIKON", "D2X", "2950K", { 0.90780, 1, 2.96454, 0 } }, - { "NIKON", "D2X", "3000K", { 0.92086, 1, 2.89928, 0 } }, - { "NIKON", "D2X", "3100K", { 0.94465, 1, 2.77122, 0 } }, - { "NIKON", "D2X", "3200K", { 0.96970, 1, 2.65530, 0 } }, - { "NIKON", "D2X", "3300K", { 0.99611, 1, 2.55642, 0 } }, - { "NIKON", "D2X", "3400K", { 1.01953, 1, 2.46484, 0 } }, - { "NIKON", "D2X", "3600K", { 1.07422, 1, 2.34375, 0 } }, - { "NIKON", "D2X", "3700K", { 1.09766, 1, 2.26172, 0 } }, - { "NIKON", "D2X", "3800K", { 1.12500, 1, 2.18750, 0 } }, - { "NIKON", "D2X", "4000K", { 1.17969, 1, 2.06250, 0 } }, - { "NIKON", "D2X", "4200K", { 1.24219, 1, 1.96094, 0 } }, - { "NIKON", "D2X", "4300K", { 1.27344, 1, 1.91797, 0 } }, - { "NIKON", "D2X", "4500K", { 1.33594, 1, 1.83984, 0 } }, - { "NIKON", "D2X", "4800K", { 1.42578, 1, 1.78906, 0 } }, - { "NIKON", "D2X", "5000K", { 1.48438, 1, 1.74609, 0 } }, - { "NIKON", "D2X", "5300K", { 1.55078, 1, 1.67578, 0 } }, - { "NIKON", "D2X", "5600K", { 1.61328, 1, 1.61328, 0 } }, - { "NIKON", "D2X", "5900K", { 1.67188, 1, 1.56250, 0 } }, - { "NIKON", "D2X", "6300K", { 1.74219, 1, 1.50391, 0 } }, - { "NIKON", "D2X", "6700K", { 1.80859, 1, 1.45703, 0 } }, - { "NIKON", "D2X", "7100K", { 1.86719, 1, 1.41406, 0 } }, - { "NIKON", "D2X", "7700K", { 1.94531, 1, 1.35547, 0 } }, - { "NIKON", "D2X", "8300K", { 2.01562, 1, 1.30469, 0 } }, - { "NIKON", "D2X", "9100K", { 2.09766, 1, 1.24609, 0 } }, - { "NIKON", "D2X", "10000K", { 2.17578, 1, 1.18359, 0 } }, - - /* D200 basic WB presets */ - { "NIKON", "D200", "Incandescent", { 1.148438, 1, 2.398438, 0 } }, - { "NIKON", "D200", "Fluorescent", { 1.664063, 1, 2.148438, 0 } }, - { "NIKON", "D200", "Sunlight", { 1.804688, 1, 1.398438, 0 } }, - { "NIKON", "D200", "Flash", { 2.007813, 1, 1.171875, 0 } }, - { "NIKON", "D200", "Overcast", { 1.917969, 1, 1.261719, 0 } }, - { "NIKON", "D200", "Shade", { 2.234375, 1, 1.125000, 0 } }, - - /* D200 Kelvin presets */ - { "NIKON", "D200", "2500K", { 1, 1, 3.121094, 0 } }, - { "NIKON", "D200", "2550K", { 1, 1, 3.035156, 0 } }, - { "NIKON", "D200", "2650K", { 1.011719, 1, 2.878906, 0 } }, - { "NIKON", "D200", "2700K", { 1.031250, 1, 2.804688, 0 } }, - { "NIKON", "D200", "2800K", { 1.074219, 1, 2.648438, 0 } }, - { "NIKON", "D200", "2850K", { 1.089844, 1, 2.589844, 0 } }, - { "NIKON", "D200", "2950K", { 1.132813, 1, 2.453125, 0 } }, - { "NIKON", "D200", "3000K", { 1.148438, 1, 2.398438, 0 } }, - { "NIKON", "D200", "3100K", { 1.183594, 1, 2.289063, 0 } }, - { "NIKON", "D200", "3200K", { 1.218750, 1, 2.187500, 0 } }, - { "NIKON", "D200", "3300K", { 1.250000, 1, 2.097656, 0 } }, - { "NIKON", "D200", "3400K", { 1.281250, 1, 2.015625, 0 } }, - { "NIKON", "D200", "3600K", { 1.343750, 1, 1.871094, 0 } }, - { "NIKON", "D200", "3700K", { 1.371094, 1, 1.820313, 0 } }, - { "NIKON", "D200", "3800K", { 1.402344, 1, 1.761719, 0 } }, - { "NIKON", "D200", "4000K", { 1.457031, 1, 1.667969, 0 } }, - { "NIKON", "D200", "4200K", { 1.511719, 1, 1.593750, 0 } }, - { "NIKON", "D200", "4300K", { 1.535156, 1, 1.558594, 0 } }, - { "NIKON", "D200", "4500K", { 1.589844, 1, 1.500000, 0 } }, - { "NIKON", "D200", "4800K", { 1.687500, 1, 1.449219, 0 } }, - { "NIKON", "D200", "5000K", { 1.746094, 1, 1.425781, 0 } }, - { "NIKON", "D200", "5300K", { 1.820313, 1, 1.375000, 0 } }, - { "NIKON", "D200", "5600K", { 1.863281, 1, 1.320313, 0 } }, - { "NIKON", "D200", "5900K", { 1.902344, 1, 1.273438, 0 } }, - { "NIKON", "D200", "6300K", { 1.972656, 1, 1.234375, 0 } }, - { "NIKON", "D200", "6700K", { 2.046875, 1, 1.199219, 0 } }, - { "NIKON", "D200", "7100K", { 2.105469, 1, 1.175781, 0 } }, - { "NIKON", "D200", "7700K", { 2.191406, 1, 1.144531, 0 } }, - { "NIKON", "D200", "8300K", { 2.277344, 1, 1.109375, 0 } }, - { "NIKON", "D200", "9300K", { 2.367188, 1, 1.070313, 0 } }, - { "NIKON", "D200", "10000K", { 2.453125, 1, 1.035156, 0 } }, - - { "NIKON", "D50", "Incandescent", { 1.328125, 1, 2.500000, 0 } }, - { "NIKON", "D50", "Fluorescent", { 1.945312, 1, 2.191406, 0 } }, - { "NIKON", "D50", "Sunny", { 2.140625, 1, 1.398438, 0 } }, - { "NIKON", "D50", "Flash", { 2.398438, 1, 1.339844, 0 } }, - { "NIKON", "D50", "Shade", { 2.746094, 1, 1.156250, 0 } }, - - { "NIKON", "D70", "Incandescent", { 1.343750, 1, 2.816406, 0 } }, /* 3000K */ - { "NIKON", "D70", "Fluorescent", { 1.964844, 1, 2.476563, 0 } }, /* 4200K */ - { "NIKON", "D70", "Direct sunlight", { 2.062500, 1, 1.597656, 0 } }, /* 5200K*/ - { "NIKON", "D70", "Flash", { 2.441406, 1, 1.500000, 0 } }, /* 5400K */ - { "NIKON", "D70", "Cloudy", { 2.257813, 1, 1.457031, 0 } }, /* 6000K */ - { "NIKON", "D70", "Shade", { 2.613281, 1, 1.277344, 0 } }, /* 8000K */ - - { "OLYMPUS", "E-1", "3000K Tungsten", { 1, 1.024000, 1.992000, 0 } }, - { "OLYMPUS", "E-1", "3300K", { 1.070312, 1, 1.773438, 0 } }, - { "OLYMPUS", "E-1", "3600K Incandescent", { 1.156250, 1, 1.640625, 0 } }, - { "OLYMPUS", "E-1", "3900K", { 1.234375, 1, 1.523438, 0 } }, - { "OLYMPUS", "E-1", "4000K White fluorescent", { 2.062500, 1, 1.679688, 0 } }, - { "OLYMPUS", "E-1", "4300K", { 1.414062, 1, 1.343750, 0 } }, - { "OLYMPUS", "E-1", "4500K Neutral fluorescent", { 1.835938, 1, 1.320312, 0 } }, - { "OLYMPUS", "E-1", "4800K", { 1.546875, 1, 1.226562, 0 } }, - { "OLYMPUS", "E-1", "5300K Clear day", { 1.664062, 1, 1.140625, 0 } }, - { "OLYMPUS", "E-1", "6000K Cloudy (with flash)", { 1.796875, 1, 1.046875, 0 } }, - { "OLYMPUS", "E-1", "6600K Daylight fluorescent", { 2.101562, 1, 1.085938, 0 } }, - { "OLYMPUS", "E-1", "7500K Shadows", { 2.196581, 1.094017, 1, 0 } }, - - { "OLYMPUS", "E-10", "3000K Incandescent", { 1, 1.153153, 3.441442, 0 } }, - { "OLYMPUS", "E-10", "3700K Incandescent (mood)", { 1.101562, 1, 2.351562, 0 } }, - { "OLYMPUS", "E-10", "4000K White fluorescent", { 1.460938, 1, 2.546875, 0 } }, - { "OLYMPUS", "E-10", "4500K Daylight fluorescent", { 1.460938, 1, 1.843750, 0 } }, - { "OLYMPUS", "E-10", "5500K Clear day", { 1.523438, 1, 1.617188, 0 } }, - { "OLYMPUS", "E-10", "6500K Cloudy day", { 1.687500, 1, 1.437500, 0 } }, - { "OLYMPUS", "E-10", "7500K Shadows", { 1.812500, 1, 1.312500, 0 } }, - - { "Panasonic", "DMC-FZ30", "Sunny", { 1.757576, 1, 1.446970, 0 } }, - { "Panasonic", "DMC-FZ30", "Cloudy", { 1.943182, 1, 1.276515, 0 } }, - { "Panasonic", "DMC-FZ30", "Fluorescent", { 1.098485, 1, 2.106061, 0 } }, - { "Panasonic", "DMC-FZ30", "Flash", { 1.965909, 1, 1.303030, 0 } }, - - { "PENTAX", "*ist DS", "Daylight", { 1.632812, 1, 1, 0 } }, - { "PENTAX", "*ist DS", "Shade", { 1.964844, 1, 1, 0 } }, - { "PENTAX", "*ist DS", "Cloudy", { 1.761719, 1, 1, 0 } }, - { "PENTAX", "*ist DS", "Daylight colors fluorescent", { 1.910156, 1, 1, 0 } }, - { "PENTAX", "*ist DS", "Daylight white fluorescent", { 1.521569, 1.003922, 1, 0 } }, - { "PENTAX", "*ist DS", "White light fluorescent", { 1.496094, 1, 1.023438, 0 } }, - { "PENTAX", "*ist DS", "Tungsten", { 1, 1, 2.027344, 0 } }, - { "PENTAX", "*ist DS", "Flash", { 1.695312, 1, 1, 0 } }, - - }; - - const int wb_preset_count = sizeof(wb_preset) / sizeof(wb_data); - const char raw_ext[]= "bay,bmq,cr2,crw,cs1,dc2,dcr,dng,erf,fff,hdr,jpg,k25," "kdc,mdc,mos,mrw,nef,orf,pef,pxn,raf,raw,rdc,sr2,srf,sti,tif,ufraw,x3f"; --- 96,99 ---- Index: ufraw_preview.c =================================================================== RCS file: /cvsroot/ufraw/ufraw/ufraw_preview.c,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** ufraw_preview.c 12 Feb 2006 02:02:22 -0000 1.40 --- ufraw_preview.c 21 Feb 2006 00:05:30 -0000 1.41 *************** *** 70,73 **** --- 70,74 ---- GtkProgressBar *ProgressBar; /* We need the adjustments for update_scale() */ + GtkAdjustment *WBTuningAdjustment; GtkAdjustment *TemperatureAdjustment; GtkAdjustment *GreenAdjustment; *************** *** 850,853 **** --- 851,856 ---- gtk_combo_box_set_active(data->WBCombo, i); + if (data->WBTuningAdjustment!=NULL) + gtk_adjustment_set_value(data->WBTuningAdjustment, CFG->WBTuning); gtk_adjustment_set_value(data->TemperatureAdjustment, CFG->temperature); gtk_adjustment_set_value(data->GreenAdjustment, CFG->green); *************** *** 1160,1163 **** --- 1163,1176 ---- if (CFG->autoExposure) ufraw_auto_expose(data->UF); } + if (valuep==&CFG->WBTuning) { + if ( strcmp(data->UF->conf->wb, auto_wb)==0 || + strcmp(data->UF->conf->wb, camera_wb)==0 ) { + /* Prevent recalculation of Camera/Auto WB on WBTuning events */ + data->UF->conf->WBTuning = 0; + } else { + ufraw_set_wb(data->UF); + if (CFG->autoExposure) ufraw_auto_expose(data->UF); + } + } if (valuep==&CFG->exposure) { CFG->autoExposure = FALSE; *************** *** 1771,1784 **** data->WBCombo = GTK_COMBO_BOX(gtk_combo_box_new_text()); data->WBPresets = NULL; ! gboolean make_model_match = FALSE; for (i=0; i<wb_preset_count; i++) { if (strcmp(wb_preset[i].make, "")==0) { ! gtk_combo_box_append_text(data->WBCombo, wb_preset[i].name); data->WBPresets = g_list_append(data->WBPresets, wb_preset[i].name); } else if ( (strcmp(wb_preset[i].make, uf->conf->make)==0 ) && (strcmp(wb_preset[i].model, uf->conf->model)==0)) { make_model_match = TRUE; ! gtk_combo_box_append_text(data->WBCombo, wb_preset[i].name); data->WBPresets = g_list_append(data->WBPresets, wb_preset[i].name); } } --- 1784,1807 ---- data->WBCombo = GTK_COMBO_BOX(gtk_combo_box_new_text()); data->WBPresets = NULL; ! const wb_data *lastPreset = NULL; ! gboolean make_model_match = FALSE, make_model_fine_tuning = FALSE; for (i=0; i<wb_preset_count; i++) { if (strcmp(wb_preset[i].make, "")==0) { ! /* Common presets */ data->WBPresets = g_list_append(data->WBPresets, wb_preset[i].name); + gtk_combo_box_append_text(data->WBCombo, wb_preset[i].name); } else if ( (strcmp(wb_preset[i].make, uf->conf->make)==0 ) && (strcmp(wb_preset[i].model, uf->conf->model)==0)) { + /* Camera specific presets */ make_model_match = TRUE; ! if ( lastPreset==NULL || ! strcmp(wb_preset[i].name,lastPreset->name)!=0 ) { data->WBPresets = g_list_append(data->WBPresets, wb_preset[i].name); + gtk_combo_box_append_text(data->WBCombo, wb_preset[i].name); + } else { + /* Fine tuning presets */ + make_model_fine_tuning = TRUE; + } + lastPreset = &wb_preset[i]; } } *************** *** 1795,1799 **** gtk_table_attach(subTable, event_box, 0, 6, 0, 1, GTK_FILL, 0, 0, 0); ! if (!make_model_match) { event_box = gtk_event_box_new(); label = gtk_image_new_from_stock(GTK_STOCK_DIALOG_WARNING, --- 1818,1835 ---- gtk_table_attach(subTable, event_box, 0, 6, 0, 1, GTK_FILL, 0, 0, 0); ! ! data->WBTuningAdjustment = NULL; ! if (make_model_fine_tuning) { ! data->WBTuningAdjustment = GTK_ADJUSTMENT(gtk_adjustment_new( ! CFG->WBTuning, -9, 9, 1, 1, 0)); ! g_object_set_data(G_OBJECT(data->WBTuningAdjustment), ! "Adjustment-Accuracy",(gpointer)0); ! button = gtk_spin_button_new(data->WBTuningAdjustment, 1, 0); ! g_object_set_data(G_OBJECT(data->WBTuningAdjustment), ! "Parent-Widget", button); ! gtk_table_attach(subTable, button, 6, 7, 0, 1, GTK_SHRINK, 0, 0, 0); ! g_signal_connect(G_OBJECT(data->WBTuningAdjustment), "value-changed", ! G_CALLBACK(adjustment_update), &CFG->WBTuning); ! } else if (!make_model_match) { event_box = gtk_event_box_new(); label = gtk_image_new_from_stock(GTK_STOCK_DIALOG_WARNING, Index: ufraw.h =================================================================== RCS file: /cvsroot/ufraw/ufraw/ufraw.h,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** ufraw.h 2 Feb 2006 00:02:22 -0000 1.24 --- ufraw.h 21 Feb 2006 00:05:30 -0000 1.25 *************** *** 59,62 **** --- 59,63 ---- char *model; char *name; + int tuning; double channel[4]; } wb_data; *************** *** 124,127 **** --- 125,129 ---- // int wb; char wb[max_name]; + double WBTuning; double temperature, green; double chanMul[4]; Index: ufraw_conf.c =================================================================== RCS file: /cvsroot/ufraw/ufraw/ufraw_conf.c,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** ufraw_conf.c 6 Feb 2006 20:40:28 -0000 1.19 --- ufraw_conf.c 21 Feb 2006 00:05:30 -0000 1.20 *************** *** 26,30 **** /* Image manipulation settings */ ! camera_wb, /* wb */ 6500, 1.0, /* temperature, green */ { -1.0, -1.0, -1.0, -1.0 }, /* chanMul[] */ --- 26,30 ---- /* Image manipulation settings */ ! camera_wb, 0, /* wb, WBTuning */ 6500, 1.0, /* temperature, green */ { -1.0, -1.0, -1.0, -1.0 }, /* chanMul[] */ *************** *** 422,425 **** --- 422,426 ---- } } + if (!strcmp("WBFineTuning", element)) sscanf(temp, "%lf", &c->WBTuning); if (!strcmp("Temperature", element)) sscanf(temp, "%lf", &c->temperature); if (!strcmp("Green", element)) sscanf(temp, "%lf", &c->green); *************** *** 637,640 **** --- 638,644 ---- if (strcmp(c->wb, conf_default.wb)) buf = uf_markup_buf(buf, "<WB>%s</WB>\n", c->wb); + if (c->WBTuning!=conf_default.WBTuning) + buf = uf_markup_buf(buf, "<WBFineTuning>%d</WBFineTuning>\n", + (int)floor(c->WBTuning)); buf = uf_markup_buf(buf, "<Temperature>%d</Temperature>\n", (int)floor(c->temperature)); Index: ufraw_ufraw.c =================================================================== RCS file: /cvsroot/ufraw/ufraw/ufraw_ufraw.c,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** ufraw_ufraw.c 9 Feb 2006 00:27:47 -0000 1.35 --- ufraw_ufraw.c 21 Feb 2006 00:05:30 -0000 1.36 *************** *** 468,475 **** --- 468,477 ---- for (c=0; c<raw->colors; c++) uf->conf->chanMul[c] /= min; if (raw->colors<4) uf->conf->chanMul[3] = 0.0; + uf->conf->WBTuning = 0; return UFRAW_SUCCESS; } if (!strcmp(uf->conf->wb, spot_wb)) { /* do nothing */ + uf->conf->WBTuning = 0; } else if ( !strcmp(uf->conf->wb, auto_wb) || !strcmp(uf->conf->wb, camera_wb) ) { *************** *** 492,502 **** for (c=0; c<raw->colors; c++) uf->conf->chanMul[c] = raw->post_mul[c]; } else { for (i=0; i<wb_preset_count; i++) { if (!strcmp(uf->conf->wb, wb_preset[i].name) && !strcmp(uf->conf->make, wb_preset[i].make) && !strcmp(uf->conf->model, wb_preset[i].model) ) { for (c=0; c<raw->colors; c++) ! uf->conf->chanMul[c] = wb_preset[i].channel[c]; break; } --- 494,535 ---- for (c=0; c<raw->colors; c++) uf->conf->chanMul[c] = raw->post_mul[c]; + uf->conf->WBTuning = 0; } else { + int lastTuning = -1; for (i=0; i<wb_preset_count; i++) { if (!strcmp(uf->conf->wb, wb_preset[i].name) && !strcmp(uf->conf->make, wb_preset[i].make) && !strcmp(uf->conf->model, wb_preset[i].model) ) { + if (uf->conf->WBTuning == wb_preset[i].tuning) { + for (c=0; c<raw->colors; c++) + uf->conf->chanMul[c] = wb_preset[i].channel[c]; + break; + } else if (uf->conf->WBTuning < wb_preset[i].tuning) { + if (lastTuning == -1) { + /* WBTuning was set to a value smaller than possible */ + uf->conf->WBTuning = wb_preset[i].tuning; + for (c=0; c<raw->colors; c++) + uf->conf->chanMul[c] = wb_preset[i].channel[c]; + break; + } else { + /* Extrapolate WB tuning values: + * f(x) = f(a) + (x-a)*(f(b)-f(a))/(b-a) */ + for (c=0; c<raw->colors; c++) + uf->conf->chanMul[c] = wb_preset[i].channel[c] + + (uf->conf->WBTuning - wb_preset[i].tuning) * + (wb_preset[lastTuning].channel[c] - + wb_preset[i].channel[c]) / + (wb_preset[lastTuning].tuning - + wb_preset[i].tuning); + break; + } + } else if (uf->conf->WBTuning > wb_preset[i].tuning) { + lastTuning = i; + } + } else if (lastTuning!=-1) { + /* WBTuning was set to a value larger than possible */ + uf->conf->WBTuning = wb_preset[lastTuning].tuning; for (c=0; c<raw->colors; c++) ! uf->conf->chanMul[c] = wb_preset[lastTuning].channel[c]; break; } Index: Makefile.am =================================================================== RCS file: /cvsroot/ufraw/ufraw/Makefile.am,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Makefile.am 23 Jan 2006 06:39:21 -0000 1.12 --- Makefile.am 21 Feb 2006 00:05:30 -0000 1.13 *************** *** 27,31 **** UFRAW_COMMON = ufraw_ufraw.c ufraw_routines.c ufraw_exif.c ufraw_developer.c \ ! ufraw_conf.c ufraw_writer.c ufraw.h ufraw_icon.h blackbody.h \ dcraw_api.c dcraw_api.h dcraw_indi.c nikon_curve.c nikon_curve.h \ iccjpeg.c iccjpeg.h --- 27,31 ---- UFRAW_COMMON = ufraw_ufraw.c ufraw_routines.c ufraw_exif.c ufraw_developer.c \ ! ufraw_conf.c ufraw_writer.c ufraw.h ufraw_icon.h wb_presets.c blackbody.h \ dcraw_api.c dcraw_api.h dcraw_indi.c nikon_curve.c nikon_curve.h \ iccjpeg.c iccjpeg.h |
|
From: Udi F. <udi...@us...> - 2006-02-20 14:52:34
|
Update of /cvsroot/ufraw/ufraw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19335 Modified Files: ufraw_developer.c Log Message: Apply the base curve before the gamma curve. This seems to simulate the results from the Nikon software better. Index: ufraw_developer.c =================================================================== RCS file: /cvsroot/ufraw/ufraw/ufraw_developer.c,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** ufraw_developer.c 5 Feb 2006 17:52:21 -0000 1.14 --- ufraw_developer.c 20 Feb 2006 14:52:25 -0000 1.15 *************** *** 129,136 **** c = 1.0; } ! for (i=0; i<0x10000*d->linear; i++) d->gammaCurve[i] = ! cs->m_Samples[(gushort)MIN(c*i, 0xFFFF)]; for (; i<0x10000; i++) d->gammaCurve[i] = ! cs->m_Samples[(gushort)MIN(pow(a*i/0x10000+b, g)*0x10000, 0xFFFF)]; CurveSampleFree(cs); } --- 129,136 ---- c = 1.0; } ! for (i=0; i<0x10000 && cs->m_Samples[i]<0x10000*d->linear ; i++) ! d->gammaCurve[i] = MIN(c*cs->m_Samples[i], 0xFFFF); for (; i<0x10000; i++) d->gammaCurve[i] = ! MIN(pow(a*cs->m_Samples[i]/0x10000+b, g)*0x10000, 0xFFFF); CurveSampleFree(cs); } |
|
From: Niels K. B. J. <nk...@us...> - 2006-02-19 17:47:51
|
Update of /cvsroot/ufraw/ufraw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18080 Modified Files: ufraw_routines.c Log Message: Add WB presets for Canon PowerShot S70. Index: ufraw_routines.c =================================================================== RCS file: /cvsroot/ufraw/ufraw/ufraw_routines.c,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** ufraw_routines.c 19 Feb 2006 05:12:25 -0000 1.49 --- ufraw_routines.c 19 Feb 2006 17:47:43 -0000 1.50 *************** *** 141,144 **** --- 141,152 ---- { "Canon", "PowerShot S60", "Underwater", { 2.677109, 1, 1.148193, 0 } }, + { "Canon", "PowerShot S70", "Daylight", { 1.943834, 1, 1.456654, 0 } }, + { "Canon", "PowerShot S70", "Cloudy", { 2.049939, 1, 1.382460, 0 } }, + { "Canon", "PowerShot S70", "Tungsten", { 1.169492, 1, 2.654964, 0 } }, + { "Canon", "PowerShot S70", "Fluorescent", { 1.993456, 1, 2.056283, 0 } }, + { "Canon", "PowerShot S70", "Fluorescent H", { 2.645914, 1, 1.565499, 0 } }, + { "Canon", "PowerShot S70", "Flash", { 2.389189, 1, 1.147297, 0 } }, + { "Canon", "PowerShot S70", "Underwater", { 3.110565, 1, 1.162162, 0 } }, + { "Canon", "EOS 10D", "Sunlight", { 2.159856, 1, 1.218750, 0 } }, { "Canon", "EOS 10D", "Shadow", { 2.533654, 1, 1.036058, 0 } }, |
|
From: Niels K. B. J. <nk...@us...> - 2006-02-19 05:12:29
|
Update of /cvsroot/ufraw/ufraw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22951 Modified Files: ufraw_routines.c Log Message: Add WB presets for PENTAX *ist DS. Index: ufraw_routines.c =================================================================== RCS file: /cvsroot/ufraw/ufraw/ufraw_routines.c,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** ufraw_routines.c 19 Feb 2006 04:23:39 -0000 1.48 --- ufraw_routines.c 19 Feb 2006 05:12:25 -0000 1.49 *************** *** 412,415 **** --- 412,424 ---- { "Panasonic", "DMC-FZ30", "Flash", { 1.965909, 1, 1.303030, 0 } }, + { "PENTAX", "*ist DS", "Daylight", { 1.632812, 1, 1, 0 } }, + { "PENTAX", "*ist DS", "Shade", { 1.964844, 1, 1, 0 } }, + { "PENTAX", "*ist DS", "Cloudy", { 1.761719, 1, 1, 0 } }, + { "PENTAX", "*ist DS", "Daylight colors fluorescent", { 1.910156, 1, 1, 0 } }, + { "PENTAX", "*ist DS", "Daylight white fluorescent", { 1.521569, 1.003922, 1, 0 } }, + { "PENTAX", "*ist DS", "White light fluorescent", { 1.496094, 1, 1.023438, 0 } }, + { "PENTAX", "*ist DS", "Tungsten", { 1, 1, 2.027344, 0 } }, + { "PENTAX", "*ist DS", "Flash", { 1.695312, 1, 1, 0 } }, + }; |
|
From: Niels K. B. J. <nk...@us...> - 2006-02-19 04:23:43
|
Update of /cvsroot/ufraw/ufraw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4839 Modified Files: ufraw_routines.c Log Message: Add WB presets for Canon PowerShot G2, Nikon D100 and Nikon D200. Index: ufraw_routines.c =================================================================== RCS file: /cvsroot/ufraw/ufraw/ufraw_routines.c,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** ufraw_routines.c 18 Feb 2006 16:04:23 -0000 1.47 --- ufraw_routines.c 19 Feb 2006 04:23:39 -0000 1.48 *************** *** 105,108 **** --- 105,115 ---- { "", "", "Auto WB", { 0, 0, 0, 0} }, + { "Canon", "PowerShot G2", "Daylight", { 2.011483, 1, 1.299522, 0 } }, + { "Canon", "PowerShot G2", "Cloudy", { 2.032505, 1, 1.285851, 0 } }, + { "Canon", "PowerShot G2", "Tungsten", { 1.976008, 1, 1.332054, 0 } }, + { "Canon", "PowerShot G2", "Fluorescent", { 2.022010, 1, 1.295694, 0 } }, + { "Canon", "PowerShot G2", "Daylight Fluorescent", { 2.029637, 1, 1.286807, 0 } }, + { "Canon", "PowerShot G2", "Flash", { 2.153576, 1, 1.140680, 0 } }, + { "Canon", "PowerShot G5", "Daylight", { 1.639521, 1, 1.528144, 0 } }, { "Canon", "PowerShot G5", "Cloudy", { 1.702153, 1, 1.462919, 0 } }, *************** *** 236,239 **** --- 243,253 ---- { "MINOLTA", "DYNAX 7D", "Flash", { 1.890625, 1, 1.445312, 0} }, + { "NIKON", "D100", "Incandescent", { 1.406250, 1, 2.828125, 0 } }, + { "NIKON", "D100", "Fluorescent", { 2.058594, 1, 2.617188, 0 } }, + { "NIKON", "D100", "Sunlight", { 2.257813, 1, 1.757813, 0 } }, + { "NIKON", "D100", "Flash", { 2.539063, 1, 1.539063, 0 } }, + { "NIKON", "D100", "Overcast", { 2.507813, 1, 1.628906, 0 } }, + { "NIKON", "D100", "Shade", { 2.906250, 1, 1.437500, 0 } }, + /* * D2X with firmware A 1.01 and B 1.01 *************** *** 318,321 **** --- 332,376 ---- { "NIKON", "D2X", "10000K", { 2.17578, 1, 1.18359, 0 } }, + /* D200 basic WB presets */ + { "NIKON", "D200", "Incandescent", { 1.148438, 1, 2.398438, 0 } }, + { "NIKON", "D200", "Fluorescent", { 1.664063, 1, 2.148438, 0 } }, + { "NIKON", "D200", "Sunlight", { 1.804688, 1, 1.398438, 0 } }, + { "NIKON", "D200", "Flash", { 2.007813, 1, 1.171875, 0 } }, + { "NIKON", "D200", "Overcast", { 1.917969, 1, 1.261719, 0 } }, + { "NIKON", "D200", "Shade", { 2.234375, 1, 1.125000, 0 } }, + + /* D200 Kelvin presets */ + { "NIKON", "D200", "2500K", { 1, 1, 3.121094, 0 } }, + { "NIKON", "D200", "2550K", { 1, 1, 3.035156, 0 } }, + { "NIKON", "D200", "2650K", { 1.011719, 1, 2.878906, 0 } }, + { "NIKON", "D200", "2700K", { 1.031250, 1, 2.804688, 0 } }, + { "NIKON", "D200", "2800K", { 1.074219, 1, 2.648438, 0 } }, + { "NIKON", "D200", "2850K", { 1.089844, 1, 2.589844, 0 } }, + { "NIKON", "D200", "2950K", { 1.132813, 1, 2.453125, 0 } }, + { "NIKON", "D200", "3000K", { 1.148438, 1, 2.398438, 0 } }, + { "NIKON", "D200", "3100K", { 1.183594, 1, 2.289063, 0 } }, + { "NIKON", "D200", "3200K", { 1.218750, 1, 2.187500, 0 } }, + { "NIKON", "D200", "3300K", { 1.250000, 1, 2.097656, 0 } }, + { "NIKON", "D200", "3400K", { 1.281250, 1, 2.015625, 0 } }, + { "NIKON", "D200", "3600K", { 1.343750, 1, 1.871094, 0 } }, + { "NIKON", "D200", "3700K", { 1.371094, 1, 1.820313, 0 } }, + { "NIKON", "D200", "3800K", { 1.402344, 1, 1.761719, 0 } }, + { "NIKON", "D200", "4000K", { 1.457031, 1, 1.667969, 0 } }, + { "NIKON", "D200", "4200K", { 1.511719, 1, 1.593750, 0 } }, + { "NIKON", "D200", "4300K", { 1.535156, 1, 1.558594, 0 } }, + { "NIKON", "D200", "4500K", { 1.589844, 1, 1.500000, 0 } }, + { "NIKON", "D200", "4800K", { 1.687500, 1, 1.449219, 0 } }, + { "NIKON", "D200", "5000K", { 1.746094, 1, 1.425781, 0 } }, + { "NIKON", "D200", "5300K", { 1.820313, 1, 1.375000, 0 } }, + { "NIKON", "D200", "5600K", { 1.863281, 1, 1.320313, 0 } }, + { "NIKON", "D200", "5900K", { 1.902344, 1, 1.273438, 0 } }, + { "NIKON", "D200", "6300K", { 1.972656, 1, 1.234375, 0 } }, + { "NIKON", "D200", "6700K", { 2.046875, 1, 1.199219, 0 } }, + { "NIKON", "D200", "7100K", { 2.105469, 1, 1.175781, 0 } }, + { "NIKON", "D200", "7700K", { 2.191406, 1, 1.144531, 0 } }, + { "NIKON", "D200", "8300K", { 2.277344, 1, 1.109375, 0 } }, + { "NIKON", "D200", "9300K", { 2.367188, 1, 1.070313, 0 } }, + { "NIKON", "D200", "10000K", { 2.453125, 1, 1.035156, 0 } }, + { "NIKON", "D50", "Incandescent", { 1.328125, 1, 2.500000, 0 } }, { "NIKON", "D50", "Fluorescent", { 1.945312, 1, 2.191406, 0 } }, *************** *** 324,331 **** { "NIKON", "D50", "Shade", { 2.746094, 1, 1.156250, 0 } }, ! { "NIKON", "D70", "Incandescent", { 1.34375, 1, 2.816406, 0 } }, /* 3000K */ { "NIKON", "D70", "Fluorescent", { 1.964844, 1, 2.476563, 0 } }, /* 4200K */ ! { "NIKON", "D70", "Direct sunlight", { 2.0625, 1, 1.597656, 0 } }, /* 5200K*/ ! { "NIKON", "D70", "Flash", { 2.441406, 1, 1.5, 0 } }, /* 5400K */ { "NIKON", "D70", "Cloudy", { 2.257813, 1, 1.457031, 0 } }, /* 6000K */ { "NIKON", "D70", "Shade", { 2.613281, 1, 1.277344, 0 } }, /* 8000K */ --- 379,386 ---- { "NIKON", "D50", "Shade", { 2.746094, 1, 1.156250, 0 } }, ! { "NIKON", "D70", "Incandescent", { 1.343750, 1, 2.816406, 0 } }, /* 3000K */ { "NIKON", "D70", "Fluorescent", { 1.964844, 1, 2.476563, 0 } }, /* 4200K */ ! { "NIKON", "D70", "Direct sunlight", { 2.062500, 1, 1.597656, 0 } }, /* 5200K*/ ! { "NIKON", "D70", "Flash", { 2.441406, 1, 1.500000, 0 } }, /* 5400K */ { "NIKON", "D70", "Cloudy", { 2.257813, 1, 1.457031, 0 } }, /* 6000K */ { "NIKON", "D70", "Shade", { 2.613281, 1, 1.277344, 0 } }, /* 8000K */ |
|
From: Udi F. <udi...@us...> - 2006-02-18 16:04:27
|
Update of /cvsroot/ufraw/ufraw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9010 Modified Files: ufraw_routines.c Log Message: Added WB presets for the Minolta A1. Index: ufraw_routines.c =================================================================== RCS file: /cvsroot/ufraw/ufraw/ufraw_routines.c,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** ufraw_routines.c 18 Feb 2006 13:59:31 -0000 1.46 --- ufraw_routines.c 18 Feb 2006 16:04:23 -0000 1.47 *************** *** 209,212 **** --- 209,220 ---- { "Minolta", "DiMAGE 7Hi", "Cloudy", { 1.730469, 1, 1.269531, 0 } }, /* 5823K */ + { "Minolta", "DiMAGE A1", "Daylight", { 1.808594, 1, 1.304688, 0 } }, + { "Minolta", "DiMAGE A1", "Tungsten", { 1.062500, 1, 2.675781, 0 } }, + { "Minolta", "DiMAGE A1", "Fluorescent", { 1.707031, 1, 2.039063, 0 } }, + { "Minolta", "DiMAGE A1", "Cloudy", { 1.960938, 1, 1.339844, 0 } }, + { "Minolta", "DiMAGE A1", "Shade", { 2.253906, 1, 1.199219, 0 } }, + { "Minolta", "DiMAGE A1", "Shade + 2", { 2.000000, 1, 1.183594, 0 } }, + { "Minolta", "DiMAGE A1", "Flash", { 1.972656, 1, 1.265625, 0 } }, + { "Minolta", "DiMAGE G500", "Sun", { 1.496094, 1, 1.121094, 0 } }, { "Minolta", "DiMAGE G500", "Cloudy", { 1.527344, 1, 1.105469, 0 } }, |
|
From: Niels K. B. J. <nk...@us...> - 2006-02-18 13:59:40
|
Update of /cvsroot/ufraw/ufraw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19322 Modified Files: ufraw_routines.c Log Message: Fix gamma for Nikon D50 input profile + reordering WB presets following camera list on Dave Coffin's homepage. Index: ufraw_routines.c =================================================================== RCS file: /cvsroot/ufraw/ufraw/ufraw_routines.c,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** ufraw_routines.c 17 Feb 2006 03:41:51 -0000 1.45 --- ufraw_routines.c 18 Feb 2006 13:59:31 -0000 1.46 *************** *** 97,102 **** /* The first column is the "make" of the camera, the ! second is the "model". Use the make and model as provided ! by dcraw */ const wb_data wb_preset[] = { --- 97,102 ---- /* The first column is the "make" of the camera, the ! second is the "model". Use the "make" and "model" as provided ! by DCRaw */ const wb_data wb_preset[] = { *************** *** 105,120 **** { "", "", "Auto WB", { 0, 0, 0, 0} }, ! { "NIKON", "D50", "Incandescent", { 1.328125, 1, 2.500000, 0 } }, ! { "NIKON", "D50", "Fluorescent", { 1.945312, 1, 2.191406, 0 } }, ! { "NIKON", "D50", "Sunny", { 2.140625, 1, 1.398438, 0 } }, ! { "NIKON", "D50", "Flash", { 2.398438, 1, 1.339844, 0 } }, ! { "NIKON", "D50", "Shade", { 2.746094, 1, 1.156250, 0 } }, ! { "NIKON", "D70", "Incandescent", { 1.34375, 1, 2.816406, 0 } }, /* 3000K */ ! { "NIKON", "D70", "Fluorescent", { 1.964844, 1, 2.476563, 0 } }, /* 4200K */ ! { "NIKON", "D70", "Direct sunlight", { 2.0625, 1, 1.597656, 0 } }, /* 5200K*/ ! { "NIKON", "D70", "Flash", { 2.441406, 1, 1.5, 0 } }, /* 5400K */ ! { "NIKON", "D70", "Cloudy", { 2.257813, 1, 1.457031, 0 } }, /* 6000K */ ! { "NIKON", "D70", "Shade", { 2.613281, 1, 1.277344, 0 } }, /* 8000K */ /* --- 105,230 ---- { "", "", "Auto WB", { 0, 0, 0, 0} }, ! { "Canon", "PowerShot G5", "Daylight", { 1.639521, 1, 1.528144, 0 } }, ! { "Canon", "PowerShot G5", "Cloudy", { 1.702153, 1, 1.462919, 0 } }, ! { "Canon", "PowerShot G5", "Tungsten", { 1.135071, 1, 2.374408, 0 } }, ! { "Canon", "PowerShot G5", "Fluorescent", { 1.660281, 1, 2.186462, 0 } }, ! { "Canon", "PowerShot G5", "Daylight Fluorescent", { 1.463297, 1, 1.764140, 0 } }, ! { "Canon", "PowerShot G5", "Flash", { 1.603593, 1, 1.562874, 0 } }, ! { "Canon", "PowerShot G6", "Daylight", { 1.769704, 1, 1.637931, 0 } }, ! { "Canon", "PowerShot G6", "Cloudy", { 2.062731, 1, 1.442804, 0 } }, ! { "Canon", "PowerShot G6", "Tungsten", { 1.077106, 1, 2.721234, 0 } }, ! { "Canon", "PowerShot G6", "Fluorescent", { 1.914922, 1, 2.142670, 0 } }, ! { "Canon", "PowerShot G6", "Fluorescent H", { 2.543677, 1, 1.650587, 0 } }, ! { "Canon", "PowerShot G6", "Flash", { 2.285322, 1, 1.333333, 0 } }, ! ! { "Canon", "PowerShot S50", "Daylight", { 1.772506, 1, 1.536496, 0 } }, ! { "Canon", "PowerShot S50", "Cloudy", { 1.831311, 1, 1.484223, 0 } }, ! { "Canon", "PowerShot S50", "Tungsten", { 1.185542, 1, 2.480723, 0 } }, ! { "Canon", "PowerShot S50", "Fluorescent", { 1.706410, 1, 2.160256, 0 } }, ! { "Canon", "PowerShot S50", "Fluorescent H", { 1.562500, 1, 1.817402, 0 } }, ! { "Canon", "PowerShot S50", "Flash", { 1.776156, 1, 1.531630, 0 } }, ! ! { "Canon", "PowerShot S60", "Daylight", { 1.742169, 1, 1.486747, 0 } }, ! { "Canon", "PowerShot S60", "Cloudy", { 1.881437, 1, 1.366467, 0 } }, ! { "Canon", "PowerShot S60", "Tungsten", { 1.144910, 1, 2.566467, 0 } }, ! { "Canon", "PowerShot S60", "Fluorescent", { 1.714650, 1, 2.053503, 0 } }, ! { "Canon", "PowerShot S60", "Fluorescent H", { 2.849655, 1, 2.067586, 0 } }, ! { "Canon", "PowerShot S60", "Flash", { 2.143229, 1, 1.190104, 0 } }, ! { "Canon", "PowerShot S60", "Underwater", { 2.677109, 1, 1.148193, 0 } }, ! ! { "Canon", "EOS 10D", "Sunlight", { 2.159856, 1, 1.218750, 0 } }, ! { "Canon", "EOS 10D", "Shadow", { 2.533654, 1, 1.036058, 0 } }, ! { "Canon", "EOS 10D", "Cloudy", { 2.348558, 1, 1.116587, 0 } }, ! { "Canon", "EOS 10D", "Indescandent", { 1.431544, 1, 1.851040, 0 } }, ! { "Canon", "EOS 10D", "Flourescent", { 1.891509, 1, 1.647406, 0 } }, ! { "Canon", "EOS 10D", "Flash", { 2.385817, 1, 1.115385, 0 } }, ! ! { "Canon", "EOS 20D", "Daylight", { 1.954680, 1, 1.478818, 0} }, ! { "Canon", "EOS 20D", "Shade", { 2.248276, 1, 1.227586, 0} }, ! { "Canon", "EOS 20D", "Cloudy", { 2.115271, 1, 1.336946, 0} }, ! { "Canon", "EOS 20D", "Tungsten", { 1.368087, 1, 2.417044, 0} }, ! { "Canon", "EOS 20D", "Fluorescent", { 1.752709, 1, 2.060098, 0} }, ! { "Canon", "EOS 20D", "Flash", { 2.145813, 1, 1.293596, 0} }, ! ! { "Canon", "EOS 300D DIGITAL", "Daylight", { 2.13702, 1, 1.15745, 0 } }, ! { "Canon", "EOS 300D DIGITAL", "Cloudy", { 2.50961, 1, 0.97716, 0 } }, ! { "Canon", "EOS 300D DIGITAL", "Tungsten", { 2.32091, 1, 1.05529, 0 } }, ! { "Canon", "EOS 300D DIGITAL", "Flourescent", { 1.39677, 1, 1.79892, 0 } }, ! { "Canon", "EOS 300D DIGITAL", "Flash", { 1.84229, 1, 1.60573, 0 } }, ! { "Canon", "EOS 300D DIGITAL", "Shade", { 2.13702, 1, 1.15745, 0 } }, ! ! { "Canon", "EOS 350D DIGITAL", "Tungsten", { 1.554250, 1, 2.377034, 0 } }, ! { "Canon", "EOS 350D DIGITAL", "Daylight", { 2.392927, 1, 1.487230, 0 } }, ! { "Canon", "EOS 350D DIGITAL", "Fluorescent", { 1.999040, 1, 1.995202, 0 } }, ! { "Canon", "EOS 350D DIGITAL", "Shade", { 2.827112, 1, 1.235756, 0 } }, ! { "Canon", "EOS 350D DIGITAL", "Flash", { 2.715128, 1, 1.295678, 0 } }, ! { "Canon", "EOS 350D DIGITAL", "Cloudy", { 2.611984, 1, 1.343811, 0 } }, ! ! { "Canon", "EOS DIGITAL REBEL", "Daylight", { 2.13702, 1, 1.15745, 0 } }, ! { "Canon", "EOS DIGITAL REBEL", "Cloudy", { 2.50961, 1, 0.97716, 0 } }, ! { "Canon", "EOS DIGITAL REBEL", "Tungsten", { 2.32091, 1, 1.05529, 0 } }, ! { "Canon", "EOS DIGITAL REBEL", "Flourescent", { 1.39677, 1, 1.79892, 0 } }, ! { "Canon", "EOS DIGITAL REBEL", "Flash", { 1.84229, 1, 1.60573, 0 } }, ! { "Canon", "EOS DIGITAL REBEL", "Shade", { 2.13702, 1, 1.15745, 0 } }, ! ! { "Canon", "EOS DIGITAL REBEL XT", "Tungsten", { 1.554250, 1, 2.377034, 0 } }, ! { "Canon", "EOS DIGITAL REBEL XT", "Daylight", { 2.392927, 1, 1.487230, 0 } }, ! { "Canon", "EOS DIGITAL REBEL XT", "Fluorescent", { 1.999040, 1, 1.995202, 0 } }, ! { "Canon", "EOS DIGITAL REBEL XT", "Shade", { 2.827112, 1, 1.235756, 0 } }, ! { "Canon", "EOS DIGITAL REBEL XT", "Flash", { 2.715128, 1, 1.295678, 0 } }, ! { "Canon", "EOS DIGITAL REBEL XT", "Cloudy", { 2.611984, 1, 1.343811, 0 } }, ! ! { "Canon", "EOS-1D Mark II", "Cloudy", { 2.093750, 1, 1.166016, 0} }, ! { "Canon", "EOS-1D Mark II", "Daylight", { 1.957031, 1, 1.295898, 0} }, ! { "Canon", "EOS-1D Mark II", "Flash", { 2.225586, 1, 1.172852, 0} }, ! { "Canon", "EOS-1D Mark II", "Fluorescent", { 1.785853, 1, 1.785853, 0} }, ! { "Canon", "EOS-1D Mark II", "Shade", { 2.220703, 1, 1.069336, 0} }, ! { "Canon", "EOS-1D Mark II", "Tungsten", { 1.415480, 1, 2.160142, 0} }, ! ! { "FUJIFILM", "FinePix S5000", "Incandescent", { 1.212081, 1, 2.672364, 0 } }, ! { "FUJIFILM", "FinePix S5000", "Fluorescent", { 1.772316, 1, 2.349902, 0 } }, ! { "FUJIFILM", "FinePix S5000", "Direct sunlight", { 1.860403, 1, 1.515946, 0 } }, ! { "FUJIFILM", "FinePix S5000", "Flash", { 2.202181, 1, 1.423284, 0 } }, ! { "FUJIFILM", "FinePix S5000", "Cloudy", { 2.036578, 1, 1.382513, 0 } }, ! { "FUJIFILM", "FinePix S5000", "Shade", { 2.357215, 1, 1.212016, 0 } }, ! ! { "FUJIFILM", "FinePix S7000", "Outdoor fine", { 1.900000, 1, 1.525000, 0 } }, ! { "FUJIFILM", "FinePix S7000", "Shade", { 2.137500, 1, 1.350000, 0 } }, ! { "FUJIFILM", "FinePix S7000", "Daylight fluorescent", { 2.315217, 1, 1.347826, 0 } }, ! { "FUJIFILM", "FinePix S7000", "Warm White fluorescent", { 1.902174, 1, 1.663043, 0 } }, ! { "FUJIFILM", "FinePix S7000", "Cool White fluorescent", { 1.836957, 1, 2.130435, 0 } }, ! { "FUJIFILM", "FinePix S7000", "Incandescent", { 1.221239, 1, 2.548673, 0 } }, ! ! { "LEICA", "DIGILUX 2", "Sunshine", { 1.628906, 1, 1.488281, 0 } }, ! { "LEICA", "DIGILUX 2", "Cloudy", { 1.835938, 1, 1.343750, 0 } }, ! { "LEICA", "DIGILUX 2", "Indoor Halogen", { 1.078125, 1, 2.203125, 0 } }, ! { "LEICA", "DIGILUX 2", "Flash", { 2.074219, 1, 1.304688, 0 } }, ! { "LEICA", "DIGILUX 2", "B/W", { 1.632812, 1, 1.550781, 0 } }, ! ! { "Minolta", "DiMAGE 7Hi", "Daylight", { 1.609375, 1, 1.328125, 0 } }, /* 5500K */ ! { "Minolta", "DiMAGE 7Hi", "Tungsten", { 1, 1.137778, 2.768889, 0 } }, /* 2800K */ ! { "Minolta", "DiMAGE 7Hi", "Fluorescent 1", { 1.664062, 1, 2.105469, 0 } }, /* 4060K*/ ! { "Minolta", "DiMAGE 7Hi", "Fluorescent 2", { 1.796875, 1, 1.734375, 0 } }, /* 4938K */ ! { "Minolta", "DiMAGE 7Hi", "Cloudy", { 1.730469, 1, 1.269531, 0 } }, /* 5823K */ ! ! { "Minolta", "DiMAGE G500", "Sun", { 1.496094, 1, 1.121094, 0 } }, ! { "Minolta", "DiMAGE G500", "Cloudy", { 1.527344, 1, 1.105469, 0 } }, ! { "Minolta", "DiMAGE G500", "Luminescent", { 1.382813, 1, 1.347656, 0 } }, ! { "Minolta", "DiMAGE G500", "Lamp", { 1.042969, 1, 1.859375, 0 } }, ! ! { "MINOLTA", "DYNAX 5D", "Daylight", { 1.660156, 1, 1.625000, 0 } }, ! { "MINOLTA", "DYNAX 5D", "Shade", { 1.898438, 1, 1.421875, 0 } }, ! { "MINOLTA", "DYNAX 5D", "Cloudy", { 1.777344, 1, 1.488281, 0 } }, ! { "MINOLTA", "DYNAX 5D", "Tungsten", { 1.000000, 1, 3.626016, 0 } }, ! { "MINOLTA", "DYNAX 5D", "Fluorescent", { 1.597656, 1, 2.496094, 0 } }, ! { "MINOLTA", "DYNAX 5D", "Flash", { 1.812500, 1, 1.445312, 0 } }, ! ! { "MINOLTA", "DYNAX 7D", "Daylight", { 1.621094, 1, 1.601562, 0} }, ! { "MINOLTA", "DYNAX 7D", "Shade", { 1.855469, 1, 1.402344, 0} }, ! { "MINOLTA", "DYNAX 7D", "Cloudy", { 1.738281, 1, 1.464844, 0} }, ! { "MINOLTA", "DYNAX 7D", "Tungsten", { 0.945312, 1, 3.292969, 0} }, ! { "MINOLTA", "DYNAX 7D", "Fluorescent", { 1.570312, 1, 2.453125, 0} }, ! { "MINOLTA", "DYNAX 7D", "Flash", { 1.890625, 1, 1.445312, 0} }, /* *************** *** 200,319 **** { "NIKON", "D2X", "10000K", { 2.17578, 1, 1.18359, 0 } }, ! { "MINOLTA", "DYNAX 5D", "Daylight", { 1.660156, 1, 1.625000, 0 } }, ! { "MINOLTA", "DYNAX 5D", "Shade", { 1.898438, 1, 1.421875, 0 } }, ! { "MINOLTA", "DYNAX 5D", "Cloudy", { 1.777344, 1, 1.488281, 0 } }, ! { "MINOLTA", "DYNAX 5D", "Tungsten", { 1.000000, 1, 3.626016, 0 } }, ! { "MINOLTA", "DYNAX 5D", "Fluorescent", { 1.597656, 1, 2.496094, 0 } }, ! { "MINOLTA", "DYNAX 5D", "Flash", { 1.812500, 1, 1.445312, 0 } }, ! ! { "MINOLTA", "DYNAX 7D", "Cloudy", { 1.738281, 1, 1.464844, 0} }, ! { "MINOLTA", "DYNAX 7D", "Daylight", { 1.621094, 1, 1.601562, 0} }, ! { "MINOLTA", "DYNAX 7D", "Flash", { 1.890625, 1, 1.445312, 0} }, ! { "MINOLTA", "DYNAX 7D", "Fluorescent", { 1.570312, 1, 2.453125, 0} }, ! { "MINOLTA", "DYNAX 7D", "Shade", { 1.855469, 1, 1.402344, 0} }, ! { "MINOLTA", "DYNAX 7D", "Tungsten", { 0.945312, 1, 3.292969, 0} }, ! ! { "Minolta", "DiMAGE 7Hi", "Daylight", { 1.609375, 1, 1.328125, 0 } }, /* 5500K */ ! { "Minolta", "DiMAGE 7Hi", "Tungsten", { 1, 1.137778, 2.768889, 0 } }, /* 2800K */ ! { "Minolta", "DiMAGE 7Hi", "Fluorescent 1", { 1.664062, 1, 2.105469, 0 } }, /* 4060K*/ ! { "Minolta", "DiMAGE 7Hi", "Fluorescent 2", { 1.796875, 1, 1.734375, 0 } }, /* 4938K */ ! { "Minolta", "DiMAGE 7Hi", "Cloudy", { 1.730469, 1, 1.269531, 0 } }, /* 5823K */ ! ! { "Minolta", "DiMAGE G500", "Sun", { 1.496094, 1, 1.121094, 0 } }, ! { "Minolta", "DiMAGE G500", "Cloudy", { 1.527344, 1, 1.105469, 0 } }, ! { "Minolta", "DiMAGE G500", "Luminescent", { 1.382813, 1, 1.347656, 0 } }, ! { "Minolta", "DiMAGE G500", "Lamp", { 1.042969, 1, 1.859375, 0 } }, ! ! { "Canon", "EOS DIGITAL REBEL XT", "Tungsten", { 1.554250, 1, 2.377034, 0 } }, ! { "Canon", "EOS DIGITAL REBEL XT", "Daylight", { 2.392927, 1, 1.487230, 0 } }, ! { "Canon", "EOS DIGITAL REBEL XT", "Fluorescent", { 1.999040, 1, 1.995202, 0 } }, ! { "Canon", "EOS DIGITAL REBEL XT", "Shade", { 2.827112, 1, 1.235756, 0 } }, ! { "Canon", "EOS DIGITAL REBEL XT", "Flash", { 2.715128, 1, 1.295678, 0 } }, ! { "Canon", "EOS DIGITAL REBEL XT", "Cloudy", { 2.611984, 1, 1.343811, 0 } }, ! ! { "Canon", "EOS 350D DIGITAL", "Tungsten", { 1.554250, 1, 2.377034, 0 } }, ! { "Canon", "EOS 350D DIGITAL", "Daylight", { 2.392927, 1, 1.487230, 0 } }, ! { "Canon", "EOS 350D DIGITAL", "Fluorescent", { 1.999040, 1, 1.995202, 0 } }, ! { "Canon", "EOS 350D DIGITAL", "Shade", { 2.827112, 1, 1.235756, 0 } }, ! { "Canon", "EOS 350D DIGITAL", "Flash", { 2.715128, 1, 1.295678, 0 } }, ! { "Canon", "EOS 350D DIGITAL", "Cloudy", { 2.611984, 1, 1.343811, 0 } }, ! ! { "Canon", "EOS DIGITAL REBEL", "Daylight", { 2.13702, 1, 1.15745, 0 } }, ! { "Canon", "EOS DIGITAL REBEL", "Cloudy", { 2.50961, 1, 0.97716, 0 } }, ! { "Canon", "EOS DIGITAL REBEL", "Tungsten", { 2.32091, 1, 1.05529, 0 } }, ! { "Canon", "EOS DIGITAL REBEL", "Flourescent", { 1.39677, 1, 1.79892, 0 } }, ! { "Canon", "EOS DIGITAL REBEL", "Flash", { 1.84229, 1, 1.60573, 0 } }, ! { "Canon", "EOS DIGITAL REBEL", "Shade", { 2.13702, 1, 1.15745, 0 } }, ! ! { "Canon", "EOS 300D DIGITAL", "Daylight", { 2.13702, 1, 1.15745, 0 } }, ! { "Canon", "EOS 300D DIGITAL", "Cloudy", { 2.50961, 1, 0.97716, 0 } }, ! { "Canon", "EOS 300D DIGITAL", "Tungsten", { 2.32091, 1, 1.05529, 0 } }, ! { "Canon", "EOS 300D DIGITAL", "Flourescent", { 1.39677, 1, 1.79892, 0 } }, ! { "Canon", "EOS 300D DIGITAL", "Flash", { 1.84229, 1, 1.60573, 0 } }, ! { "Canon", "EOS 300D DIGITAL", "Shade", { 2.13702, 1, 1.15745, 0 } }, ! ! { "Canon", "EOS 10D", "Sunlight", { 2.159856, 1, 1.218750, 0 } }, ! { "Canon", "EOS 10D", "Shadow", { 2.533654, 1, 1.036058, 0 } }, ! { "Canon", "EOS 10D", "Cloudy", { 2.348558, 1, 1.116587, 0 } }, ! { "Canon", "EOS 10D", "Indescandent", { 1.431544, 1, 1.851040, 0 } }, ! { "Canon", "EOS 10D", "Flourescent", { 1.891509, 1, 1.647406, 0 } }, ! { "Canon", "EOS 10D", "Flash", { 2.385817, 1, 1.115385, 0 } }, ! ! { "Canon", "EOS 20D", "Daylight", { 1.954680, 1, 1.478818, 0} }, ! { "Canon", "EOS 20D", "Shade", { 2.248276, 1, 1.227586, 0} }, ! { "Canon", "EOS 20D", "Cloudy", { 2.115271, 1, 1.336946, 0} }, ! { "Canon", "EOS 20D", "Tungsten", { 1.368087, 1, 2.417044, 0} }, ! { "Canon", "EOS 20D", "Fluorescent", { 1.752709, 1, 2.060098, 0} }, ! { "Canon", "EOS 20D", "Flash", { 2.145813, 1, 1.293596, 0} }, ! ! { "Canon", "EOS-1D Mark II", "Cloudy", { 2.093750, 1, 1.166016, 0} }, ! { "Canon", "EOS-1D Mark II", "Daylight", { 1.957031, 1, 1.295898, 0} }, ! { "Canon", "EOS-1D Mark II", "Flash", { 2.225586, 1, 1.172852, 0} }, ! { "Canon", "EOS-1D Mark II", "Fluorescent", { 1.785853, 1, 1.785853, 0} }, ! { "Canon", "EOS-1D Mark II", "Shade", { 2.220703, 1, 1.069336, 0} }, ! { "Canon", "EOS-1D Mark II", "Tungsten", { 1.415480, 1, 2.160142, 0} }, ! ! { "Canon", "PowerShot G5", "Daylight", { 1.639521, 1, 1.528144, 0 } }, ! { "Canon", "PowerShot G5", "Cloudy", { 1.702153, 1, 1.462919, 0 } }, ! { "Canon", "PowerShot G5", "Tungsten", { 1.135071, 1, 2.374408, 0 } }, ! { "Canon", "PowerShot G5", "Fluorescent", { 1.660281, 1, 2.186462, 0 } }, ! { "Canon", "PowerShot G5", "Daylight Fluorescent", { 1.463297, 1, 1.764140, 0 } }, ! { "Canon", "PowerShot G5", "Flash", { 1.603593, 1, 1.562874, 0 } }, ! ! { "Canon", "PowerShot G6", "Daylight", { 1.769704, 1, 1.637931, 0 } }, ! { "Canon", "PowerShot G6", "Cloudy", { 2.062731, 1, 1.442804, 0 } }, ! { "Canon", "PowerShot G6", "Tungsten", { 1.077106, 1, 2.721234, 0 } }, ! { "Canon", "PowerShot G6", "Fluorescent", { 1.914922, 1, 2.142670, 0 } }, ! { "Canon", "PowerShot G6", "Fluorescent H", { 2.543677, 1, 1.650587, 0 } }, ! { "Canon", "PowerShot G6", "Flash", { 2.285322, 1, 1.333333, 0 } }, ! ! { "Canon", "PowerShot S50", "Daylight", { 1.772506, 1, 1.536496, 0 } }, ! { "Canon", "PowerShot S50", "Cloudy", { 1.831311, 1, 1.484223, 0 } }, ! { "Canon", "PowerShot S50", "Tungsten", { 1.185542, 1, 2.480723, 0 } }, ! { "Canon", "PowerShot S50", "Fluorescent", { 1.706410, 1, 2.160256, 0 } }, ! { "Canon", "PowerShot S50", "Fluorescent H", { 1.562500, 1, 1.817402, 0 } }, ! { "Canon", "PowerShot S50", "Flash", { 1.776156, 1, 1.531630, 0 } }, ! ! { "Canon", "PowerShot S60", "Daylight", { 1.742169, 1, 1.486747, 0 } }, ! { "Canon", "PowerShot S60", "Cloudy", { 1.881437, 1, 1.366467, 0 } }, ! { "Canon", "PowerShot S60", "Tungsten", { 1.144910, 1, 2.566467, 0 } }, ! { "Canon", "PowerShot S60", "Fluorescent", { 1.714650, 1, 2.053503, 0 } }, ! { "Canon", "PowerShot S60", "Fluorescent H", { 2.849655, 1, 2.067586, 0 } }, ! { "Canon", "PowerShot S60", "Flash", { 2.143229, 1, 1.190104, 0 } }, ! { "Canon", "PowerShot S60", "Underwater", { 2.677109, 1, 1.148193, 0 } }, ! ! { "FUJIFILM", "FinePix S5000", "Incandescent", { 1.212081, 1, 2.672364, 0 } }, ! { "FUJIFILM", "FinePix S5000", "Fluorescent", { 1.772316, 1, 2.349902, 0 } }, ! { "FUJIFILM", "FinePix S5000", "Direct sunlight", { 1.860403, 1, 1.515946, 0 } }, ! { "FUJIFILM", "FinePix S5000", "Flash", { 2.202181, 1, 1.423284, 0 } }, ! { "FUJIFILM", "FinePix S5000", "Cloudy", { 2.036578, 1, 1.382513, 0 } }, ! { "FUJIFILM", "FinePix S5000", "Shade", { 2.357215, 1, 1.212016, 0 } }, ! { "FUJIFILM", "FinePix S7000", "Outdoor fine", { 1.900000, 1, 1.525000, 0 } }, ! { "FUJIFILM", "FinePix S7000", "Shade", { 2.137500, 1, 1.350000, 0 } }, ! { "FUJIFILM", "FinePix S7000", "Daylight fluorescent", { 2.315217, 1, 1.347826, 0 } }, ! { "FUJIFILM", "FinePix S7000", "Warm White fluorescent", { 1.902174, 1, 1.663043, 0 } }, ! { "FUJIFILM", "FinePix S7000", "Cool White fluorescent", { 1.836957, 1, 2.130435, 0 } }, ! { "FUJIFILM", "FinePix S7000", "Incandescent", { 1.221239, 1, 2.548673, 0 } }, { "OLYMPUS", "E-1", "3000K Tungsten", { 1, 1.024000, 1.992000, 0 } }, --- 310,325 ---- { "NIKON", "D2X", "10000K", { 2.17578, 1, 1.18359, 0 } }, ! { "NIKON", "D50", "Incandescent", { 1.328125, 1, 2.500000, 0 } }, ! { "NIKON", "D50", "Fluorescent", { 1.945312, 1, 2.191406, 0 } }, ! { "NIKON", "D50", "Sunny", { 2.140625, 1, 1.398438, 0 } }, ! { "NIKON", "D50", "Flash", { 2.398438, 1, 1.339844, 0 } }, ! { "NIKON", "D50", "Shade", { 2.746094, 1, 1.156250, 0 } }, ! { "NIKON", "D70", "Incandescent", { 1.34375, 1, 2.816406, 0 } }, /* 3000K */ ! { "NIKON", "D70", "Fluorescent", { 1.964844, 1, 2.476563, 0 } }, /* 4200K */ ! { "NIKON", "D70", "Direct sunlight", { 2.0625, 1, 1.597656, 0 } }, /* 5200K*/ ! { "NIKON", "D70", "Flash", { 2.441406, 1, 1.5, 0 } }, /* 5400K */ ! { "NIKON", "D70", "Cloudy", { 2.257813, 1, 1.457031, 0 } }, /* 6000K */ ! { "NIKON", "D70", "Shade", { 2.613281, 1, 1.277344, 0 } }, /* 8000K */ { "OLYMPUS", "E-1", "3000K Tungsten", { 1, 1.024000, 1.992000, 0 } }, *************** *** 338,347 **** { "OLYMPUS", "E-10", "7500K Shadows", { 1.812500, 1, 1.312500, 0 } }, - { "LEICA", "DIGILUX 2", "Sunshine", { 1.628906, 1, 1.488281, 0 } }, - { "LEICA", "DIGILUX 2", "Cloudy", { 1.835938, 1, 1.343750, 0 } }, - { "LEICA", "DIGILUX 2", "Indoor Halogen", { 1.078125, 1, 2.203125, 0 } }, - { "LEICA", "DIGILUX 2", "Flash", { 2.074219, 1, 1.304688, 0 } }, - { "LEICA", "DIGILUX 2", "B/W", { 1.632812, 1, 1.550781, 0 } }, - { "Panasonic", "DMC-FZ30", "Sunny", { 1.757576, 1, 1.446970, 0 } }, { "Panasonic", "DMC-FZ30", "Cloudy", { 1.943182, 1, 1.276515, 0 } }, --- 344,347 ---- *************** *** 350,353 **** --- 350,354 ---- }; + const int wb_preset_count = sizeof(wb_preset) / sizeof(wb_data); *************** *** 394,401 **** if ( !strcmp(p->name, "sRGB") ) return 0.45; ! else if ( !strncmp(p->productName, "Nikon D70 for NEF", 17) ! || !strncmp(p->productName, "Nikon D100 for NEF", 18) ! || !strncmp(p->productName, "Nikon DBase for NEF", 19) /*For D100*/ ! || !strncmp(p->productName, "Nikon D1 for NEF", 16) ) return 0.45; else --- 395,403 ---- if ( !strcmp(p->name, "sRGB") ) return 0.45; ! else if ( !strncmp(p->productName, "Nikon DBase for NEF", 19) /*For D100*/ ! || !strncmp(p->productName, "Nikon D1 for NEF", 16) ! || !strncmp(p->productName, "Nikon D50 for NEF", 17) ! || !strncmp(p->productName, "Nikon D70 for NEF", 17) ! || !strncmp(p->productName, "Nikon D100 for NEF", 18) ) return 0.45; else |
|
From: Niels K. B. J. <nk...@us...> - 2006-02-17 03:41:57
|
Update of /cvsroot/ufraw/ufraw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30773 Modified Files: ufraw_routines.c Log Message: Use correct WB presets for Canon PowerShot S60. Index: ufraw_routines.c =================================================================== RCS file: /cvsroot/ufraw/ufraw/ufraw_routines.c,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** ufraw_routines.c 15 Feb 2006 16:26:57 -0000 1.44 --- ufraw_routines.c 17 Feb 2006 03:41:51 -0000 1.45 *************** *** 296,304 **** { "Canon", "PowerShot S60", "Daylight", { 1.742169, 1, 1.486747, 0 } }, ! { "Canon", "PowerShot S60", "Cloudy", { 1.742169, 1, 1.486747, 0 } }, ! { "Canon", "PowerShot S60", "Tungsten", { 1.207362, 1, 2.788957, 0 } }, ! { "Canon", "PowerShot S60", "Fluorescent", { 1.144910, 1, 2.566467, 0 } }, ! { "Canon", "PowerShot S60", "Fluorescent H", { 2.348730, 1, 1.042725, 0 } }, ! { "Canon", "PowerShot S60", "Flash", { 1.881437, 1, 1.366467, 0 } }, { "Canon", "PowerShot S60", "Underwater", { 2.677109, 1, 1.148193, 0 } }, --- 296,304 ---- { "Canon", "PowerShot S60", "Daylight", { 1.742169, 1, 1.486747, 0 } }, ! { "Canon", "PowerShot S60", "Cloudy", { 1.881437, 1, 1.366467, 0 } }, ! { "Canon", "PowerShot S60", "Tungsten", { 1.144910, 1, 2.566467, 0 } }, ! { "Canon", "PowerShot S60", "Fluorescent", { 1.714650, 1, 2.053503, 0 } }, ! { "Canon", "PowerShot S60", "Fluorescent H", { 2.849655, 1, 2.067586, 0 } }, ! { "Canon", "PowerShot S60", "Flash", { 2.143229, 1, 1.190104, 0 } }, { "Canon", "PowerShot S60", "Underwater", { 2.677109, 1, 1.148193, 0 } }, |
|
From: Niels K. B. J. <nk...@us...> - 2006-02-15 16:27:08
|
Update of /cvsroot/ufraw/ufraw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32751 Modified Files: ufraw_routines.c Log Message: Update WB presets for Minolta DiMAGE 7Hi. Index: ufraw_routines.c =================================================================== RCS file: /cvsroot/ufraw/ufraw/ufraw_routines.c,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** ufraw_routines.c 15 Feb 2006 15:52:21 -0000 1.43 --- ufraw_routines.c 15 Feb 2006 16:26:57 -0000 1.44 *************** *** 215,219 **** { "Minolta", "DiMAGE 7Hi", "Daylight", { 1.609375, 1, 1.328125, 0 } }, /* 5500K */ ! { "Minolta", "DiMAGE 7Hi", "Tungsten", { 0.878906, 1, 2.433594, 0 } }, /* 2800K */ { "Minolta", "DiMAGE 7Hi", "Fluorescent 1", { 1.664062, 1, 2.105469, 0 } }, /* 4060K*/ { "Minolta", "DiMAGE 7Hi", "Fluorescent 2", { 1.796875, 1, 1.734375, 0 } }, /* 4938K */ --- 215,219 ---- { "Minolta", "DiMAGE 7Hi", "Daylight", { 1.609375, 1, 1.328125, 0 } }, /* 5500K */ ! { "Minolta", "DiMAGE 7Hi", "Tungsten", { 1, 1.137778, 2.768889, 0 } }, /* 2800K */ { "Minolta", "DiMAGE 7Hi", "Fluorescent 1", { 1.664062, 1, 2.105469, 0 } }, /* 4060K*/ { "Minolta", "DiMAGE 7Hi", "Fluorescent 2", { 1.796875, 1, 1.734375, 0 } }, /* 4938K */ |
|
From: Udi F. <udi...@us...> - 2006-02-15 15:52:28
|
Update of /cvsroot/ufraw/ufraw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19831 Modified Files: ufraw_routines.c Log Message: Added WB presets for the Minolta 5D. Index: ufraw_routines.c =================================================================== RCS file: /cvsroot/ufraw/ufraw/ufraw_routines.c,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** ufraw_routines.c 15 Feb 2006 15:27:17 -0000 1.42 --- ufraw_routines.c 15 Feb 2006 15:52:21 -0000 1.43 *************** *** 200,203 **** --- 200,210 ---- { "NIKON", "D2X", "10000K", { 2.17578, 1, 1.18359, 0 } }, + { "MINOLTA", "DYNAX 5D", "Daylight", { 1.660156, 1, 1.625000, 0 } }, + { "MINOLTA", "DYNAX 5D", "Shade", { 1.898438, 1, 1.421875, 0 } }, + { "MINOLTA", "DYNAX 5D", "Cloudy", { 1.777344, 1, 1.488281, 0 } }, + { "MINOLTA", "DYNAX 5D", "Tungsten", { 1.000000, 1, 3.626016, 0 } }, + { "MINOLTA", "DYNAX 5D", "Fluorescent", { 1.597656, 1, 2.496094, 0 } }, + { "MINOLTA", "DYNAX 5D", "Flash", { 1.812500, 1, 1.445312, 0 } }, + { "MINOLTA", "DYNAX 7D", "Cloudy", { 1.738281, 1, 1.464844, 0} }, { "MINOLTA", "DYNAX 7D", "Daylight", { 1.621094, 1, 1.601562, 0} }, |
|
From: Niels K. B. J. <nk...@us...> - 2006-02-15 15:27:25
|
Update of /cvsroot/ufraw/ufraw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10957 Modified Files: ufraw_routines.c Log Message: Use correct WB presets for Canon PowerShot G6. Index: ufraw_routines.c =================================================================== RCS file: /cvsroot/ufraw/ufraw/ufraw_routines.c,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** ufraw_routines.c 15 Feb 2006 05:35:49 -0000 1.41 --- ufraw_routines.c 15 Feb 2006 15:27:17 -0000 1.42 *************** *** 275,283 **** { "Canon", "PowerShot G6", "Daylight", { 1.769704, 1, 1.637931, 0 } }, ! { "Canon", "PowerShot G6", "Cloudy", { 1.769704, 1, 1.637931, 0 } }, ! { "Canon", "PowerShot G6", "Tungsten", { 1.146341, 1, 2.996341, 0 } }, ! { "Canon", "PowerShot G6", "Fluorescent", { 1.077106, 1, 2.721234, 0 } }, ! { "Canon", "PowerShot G6", "Fluorescent H", { 2.201958, 1, 1.351285, 0 } }, ! { "Canon", "PowerShot G6", "Flash", { 2.062731, 1, 1.442804, 0 } }, { "Canon", "PowerShot S50", "Daylight", { 1.772506, 1, 1.536496, 0 } }, --- 275,283 ---- { "Canon", "PowerShot G6", "Daylight", { 1.769704, 1, 1.637931, 0 } }, ! { "Canon", "PowerShot G6", "Cloudy", { 2.062731, 1, 1.442804, 0 } }, ! { "Canon", "PowerShot G6", "Tungsten", { 1.077106, 1, 2.721234, 0 } }, ! { "Canon", "PowerShot G6", "Fluorescent", { 1.914922, 1, 2.142670, 0 } }, ! { "Canon", "PowerShot G6", "Fluorescent H", { 2.543677, 1, 1.650587, 0 } }, ! { "Canon", "PowerShot G6", "Flash", { 2.285322, 1, 1.333333, 0 } }, { "Canon", "PowerShot S50", "Daylight", { 1.772506, 1, 1.536496, 0 } }, |
|
From: Niels K. B. J. <nk...@us...> - 2006-02-15 05:35:59
|
Update of /cvsroot/ufraw/ufraw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21170 Modified Files: ufraw_routines.c Log Message: Add WB presets for Canon PowerShot G6 and S60. Index: ufraw_routines.c =================================================================== RCS file: /cvsroot/ufraw/ufraw/ufraw_routines.c,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** ufraw_routines.c 14 Feb 2006 06:28:05 -0000 1.40 --- ufraw_routines.c 15 Feb 2006 05:35:49 -0000 1.41 *************** *** 274,277 **** --- 274,284 ---- { "Canon", "PowerShot G5", "Flash", { 1.603593, 1, 1.562874, 0 } }, + { "Canon", "PowerShot G6", "Daylight", { 1.769704, 1, 1.637931, 0 } }, + { "Canon", "PowerShot G6", "Cloudy", { 1.769704, 1, 1.637931, 0 } }, + { "Canon", "PowerShot G6", "Tungsten", { 1.146341, 1, 2.996341, 0 } }, + { "Canon", "PowerShot G6", "Fluorescent", { 1.077106, 1, 2.721234, 0 } }, + { "Canon", "PowerShot G6", "Fluorescent H", { 2.201958, 1, 1.351285, 0 } }, + { "Canon", "PowerShot G6", "Flash", { 2.062731, 1, 1.442804, 0 } }, + { "Canon", "PowerShot S50", "Daylight", { 1.772506, 1, 1.536496, 0 } }, { "Canon", "PowerShot S50", "Cloudy", { 1.831311, 1, 1.484223, 0 } }, *************** *** 281,284 **** --- 288,299 ---- { "Canon", "PowerShot S50", "Flash", { 1.776156, 1, 1.531630, 0 } }, + { "Canon", "PowerShot S60", "Daylight", { 1.742169, 1, 1.486747, 0 } }, + { "Canon", "PowerShot S60", "Cloudy", { 1.742169, 1, 1.486747, 0 } }, + { "Canon", "PowerShot S60", "Tungsten", { 1.207362, 1, 2.788957, 0 } }, + { "Canon", "PowerShot S60", "Fluorescent", { 1.144910, 1, 2.566467, 0 } }, + { "Canon", "PowerShot S60", "Fluorescent H", { 2.348730, 1, 1.042725, 0 } }, + { "Canon", "PowerShot S60", "Flash", { 1.881437, 1, 1.366467, 0 } }, + { "Canon", "PowerShot S60", "Underwater", { 2.677109, 1, 1.148193, 0 } }, + { "FUJIFILM", "FinePix S5000", "Incandescent", { 1.212081, 1, 2.672364, 0 } }, { "FUJIFILM", "FinePix S5000", "Fluorescent", { 1.772316, 1, 2.349902, 0 } }, |
|
From: Niels K. B. J. <nk...@us...> - 2006-02-14 06:28:13
|
Update of /cvsroot/ufraw/ufraw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26826 Modified Files: ufraw_routines.c Log Message: Add WB presets for Canon PowerShot G5 and FUJIFILM FinePix S7000. Index: ufraw_routines.c =================================================================== RCS file: /cvsroot/ufraw/ufraw/ufraw_routines.c,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** ufraw_routines.c 12 Feb 2006 04:20:54 -0000 1.39 --- ufraw_routines.c 14 Feb 2006 06:28:05 -0000 1.40 *************** *** 267,271 **** { "Canon", "EOS-1D Mark II", "Tungsten", { 1.415480, 1, 2.160142, 0} }, ! { "Canon", "PowerShot S50", "Day Light", { 1.772506, 1, 1.536496, 0 } }, { "Canon", "PowerShot S50", "Cloudy", { 1.831311, 1, 1.484223, 0 } }, { "Canon", "PowerShot S50", "Tungsten", { 1.185542, 1, 2.480723, 0 } }, --- 267,278 ---- { "Canon", "EOS-1D Mark II", "Tungsten", { 1.415480, 1, 2.160142, 0} }, ! { "Canon", "PowerShot G5", "Daylight", { 1.639521, 1, 1.528144, 0 } }, ! { "Canon", "PowerShot G5", "Cloudy", { 1.702153, 1, 1.462919, 0 } }, ! { "Canon", "PowerShot G5", "Tungsten", { 1.135071, 1, 2.374408, 0 } }, ! { "Canon", "PowerShot G5", "Fluorescent", { 1.660281, 1, 2.186462, 0 } }, ! { "Canon", "PowerShot G5", "Daylight Fluorescent", { 1.463297, 1, 1.764140, 0 } }, ! { "Canon", "PowerShot G5", "Flash", { 1.603593, 1, 1.562874, 0 } }, ! ! { "Canon", "PowerShot S50", "Daylight", { 1.772506, 1, 1.536496, 0 } }, { "Canon", "PowerShot S50", "Cloudy", { 1.831311, 1, 1.484223, 0 } }, { "Canon", "PowerShot S50", "Tungsten", { 1.185542, 1, 2.480723, 0 } }, *************** *** 281,284 **** --- 288,298 ---- { "FUJIFILM", "FinePix S5000", "Shade", { 2.357215, 1, 1.212016, 0 } }, + { "FUJIFILM", "FinePix S7000", "Outdoor fine", { 1.900000, 1, 1.525000, 0 } }, + { "FUJIFILM", "FinePix S7000", "Shade", { 2.137500, 1, 1.350000, 0 } }, + { "FUJIFILM", "FinePix S7000", "Daylight fluorescent", { 2.315217, 1, 1.347826, 0 } }, + { "FUJIFILM", "FinePix S7000", "Warm White fluorescent", { 1.902174, 1, 1.663043, 0 } }, + { "FUJIFILM", "FinePix S7000", "Cool White fluorescent", { 1.836957, 1, 2.130435, 0 } }, + { "FUJIFILM", "FinePix S7000", "Incandescent", { 1.221239, 1, 2.548673, 0 } }, + { "OLYMPUS", "E-1", "3000K Tungsten", { 1, 1.024000, 1.992000, 0 } }, { "OLYMPUS", "E-1", "3300K", { 1.070312, 1, 1.773438, 0 } }, |
|
From: Niels K. B. J. <nk...@us...> - 2006-02-12 04:21:03
|
Update of /cvsroot/ufraw/ufraw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4835 Modified Files: ufraw_routines.c Log Message: Add WB presets for OLYMPUS E-10 + spelling fixes. Index: ufraw_routines.c =================================================================== RCS file: /cvsroot/ufraw/ufraw/ufraw_routines.c,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** ufraw_routines.c 11 Feb 2006 13:18:56 -0000 1.38 --- ufraw_routines.c 12 Feb 2006 04:20:54 -0000 1.39 *************** *** 283,287 **** { "OLYMPUS", "E-1", "3000K Tungsten", { 1, 1.024000, 1.992000, 0 } }, { "OLYMPUS", "E-1", "3300K", { 1.070312, 1, 1.773438, 0 } }, ! { "OLYMPUS", "E-1", "3600K Incandesent", { 1.156250, 1, 1.640625, 0 } }, { "OLYMPUS", "E-1", "3900K", { 1.234375, 1, 1.523438, 0 } }, { "OLYMPUS", "E-1", "4000K White fluorescent", { 2.062500, 1, 1.679688, 0 } }, --- 283,287 ---- { "OLYMPUS", "E-1", "3000K Tungsten", { 1, 1.024000, 1.992000, 0 } }, { "OLYMPUS", "E-1", "3300K", { 1.070312, 1, 1.773438, 0 } }, ! { "OLYMPUS", "E-1", "3600K Incandescent", { 1.156250, 1, 1.640625, 0 } }, { "OLYMPUS", "E-1", "3900K", { 1.234375, 1, 1.523438, 0 } }, { "OLYMPUS", "E-1", "4000K White fluorescent", { 2.062500, 1, 1.679688, 0 } }, *************** *** 294,297 **** --- 294,305 ---- { "OLYMPUS", "E-1", "7500K Shadows", { 2.196581, 1.094017, 1, 0 } }, + { "OLYMPUS", "E-10", "3000K Incandescent", { 1, 1.153153, 3.441442, 0 } }, + { "OLYMPUS", "E-10", "3700K Incandescent (mood)", { 1.101562, 1, 2.351562, 0 } }, + { "OLYMPUS", "E-10", "4000K White fluorescent", { 1.460938, 1, 2.546875, 0 } }, + { "OLYMPUS", "E-10", "4500K Daylight fluorescent", { 1.460938, 1, 1.843750, 0 } }, + { "OLYMPUS", "E-10", "5500K Clear day", { 1.523438, 1, 1.617188, 0 } }, + { "OLYMPUS", "E-10", "6500K Cloudy day", { 1.687500, 1, 1.437500, 0 } }, + { "OLYMPUS", "E-10", "7500K Shadows", { 1.812500, 1, 1.312500, 0 } }, + { "LEICA", "DIGILUX 2", "Sunshine", { 1.628906, 1, 1.488281, 0 } }, { "LEICA", "DIGILUX 2", "Cloudy", { 1.835938, 1, 1.343750, 0 } }, *************** *** 421,425 **** * pre 0.7 calculation to the current temperature calculation */ /* ! #include <blackbody.h> void BB_Temperature_to_RGB(double T, double RGB[3]) { --- 429,433 ---- * pre 0.7 calculation to the current temperature calculation */ /* ! #include "blackbody.h" void BB_Temperature_to_RGB(double T, double RGB[3]) { |
|
From: Udi F. <udi...@us...> - 2006-02-12 02:02:37
|
Update of /cvsroot/ufraw/ufraw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29982 Modified Files: ufraw_preview.c Log Message: Split between the WB page and the Color management page in the preview. This structure is much more logical. It also helps fit the window inside 1024x768 screens. Index: ufraw_preview.c =================================================================== RCS file: /cvsroot/ufraw/ufraw/ufraw_preview.c,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** ufraw_preview.c 6 Feb 2006 20:40:28 -0000 1.39 --- ufraw_preview.c 12 Feb 2006 02:02:22 -0000 1.40 *************** *** 1758,1817 **** gtk_box_pack_start(GTK_BOX(previewVBox), noteBox, FALSE, FALSE, 0); ! /* Start of Base Curve page */ ! page = table_with_frame(noteBox, "Base", TRUE); ! ! table = GTK_TABLE(table_with_frame(page, NULL, TRUE)); ! ! data->BaseCurveCombo = GTK_COMBO_BOX(gtk_combo_box_new_text()); ! /* Fill in the curve names, skipping custom and camera curves if there is ! * no cameraCurve. This will make some mess later with the counting */ ! for (i=0; i<CFG->BaseCurveCount; i++) ! if ( (i!=custom_curve && i!=camera_curve) || CFG_cameraCurve ) ! gtk_combo_box_append_text(data->BaseCurveCombo, ! CFG->BaseCurve[i].name); ! /* This is part of the mess with the combo_box counting */ ! if (CFG->BaseCurveIndex>camera_curve && !CFG_cameraCurve) ! gtk_combo_box_set_active(data->BaseCurveCombo, CFG->BaseCurveIndex-2); ! else ! gtk_combo_box_set_active(data->BaseCurveCombo, CFG->BaseCurveIndex); ! g_signal_connect(G_OBJECT(data->BaseCurveCombo), "changed", ! G_CALLBACK(combo_update), &CFG->BaseCurveIndex); ! gtk_table_attach(table, GTK_WIDGET(data->BaseCurveCombo), 0, 7, 0, 1, ! GTK_FILL, GTK_FILL, 0, 0); ! button = gtk_button_new(); ! gtk_container_add(GTK_CONTAINER(button), gtk_image_new_from_stock( ! GTK_STOCK_OPEN, GTK_ICON_SIZE_BUTTON)); ! gtk_table_attach(table, button, 7, 8, 0, 1, GTK_SHRINK, GTK_FILL, 0, 0); ! gtk_tooltips_set_tip(data->ToolTips, button, "Load base curve", NULL); ! g_signal_connect(G_OBJECT(button), "clicked", ! G_CALLBACK(load_curve), (gpointer)base_curve); ! button = gtk_button_new(); ! gtk_container_add(GTK_CONTAINER(button), gtk_image_new_from_stock( ! GTK_STOCK_SAVE_AS, GTK_ICON_SIZE_BUTTON)); ! gtk_tooltips_set_tip(data->ToolTips, button, "Save base curve", NULL); ! gtk_table_attach(table, button, 8, 9, 0, 1, GTK_SHRINK, GTK_FILL, 0, 0); ! g_signal_connect(G_OBJECT(button), "clicked", ! G_CALLBACK(save_curve), (gpointer)base_curve); ! ! data->BaseCurveWidget = curveeditor_widget_new(curveeditorHeight, 256, ! update_scales_callback, (gpointer)base_curve); ! curveeditor_widget_set_curve(data->BaseCurveWidget, ! &CFG->BaseCurve[CFG->BaseCurveIndex]); ! gtk_table_attach(table, data->BaseCurveWidget, 1, 8, 1, 8, ! GTK_EXPAND, 0, 0, 0); ! ! data->ResetBaseCurveButton = gtk_button_new(); ! gtk_container_add(GTK_CONTAINER(data->ResetBaseCurveButton), ! gtk_image_new_from_stock(GTK_STOCK_REFRESH, GTK_ICON_SIZE_BUTTON)); ! gtk_tooltips_set_tip(data->ToolTips, GTK_WIDGET(data->ResetBaseCurveButton), ! "Reset base curve to default",NULL); ! gtk_table_attach(table, GTK_WIDGET(data->ResetBaseCurveButton), 8, 9, 7, 8, ! 0, 0, 0, 0); ! g_signal_connect(G_OBJECT(data->ResetBaseCurveButton), "clicked", ! G_CALLBACK(button_update), NULL); ! /* End of Base Curve page */ ! ! /* Start of Color setting page */ ! page = table_with_frame(noteBox, "Color", TRUE); /* Set this page to be the opening page. */ int openingPage = gtk_notebook_page_num(GTK_NOTEBOOK(noteBox), page); --- 1758,1763 ---- gtk_box_pack_start(GTK_BOX(previewVBox), noteBox, FALSE, FALSE, 0); ! /* Start of White Balance setting page */ ! page = table_with_frame(noteBox, "WB", TRUE); /* Set this page to be the opening page. */ int openingPage = gtk_notebook_page_num(GTK_NOTEBOOK(noteBox), page); *************** *** 1821,1826 **** gtk_table_attach(table, GTK_WIDGET(subTable), 0, 1, 0 , 1, GTK_EXPAND|GTK_FILL, 0, 0, 0); ! label = gtk_label_new("White balance"); ! gtk_table_attach(subTable, label, 0, 1, 0 , 1, 0, 0, 0, 0); data->WBCombo = GTK_COMBO_BOX(gtk_combo_box_new_text()); data->WBPresets = NULL; --- 1767,1772 ---- gtk_table_attach(table, GTK_WIDGET(subTable), 0, 1, 0 , 1, GTK_EXPAND|GTK_FILL, 0, 0, 0); ! // label = gtk_label_new("White balance"); ! // gtk_table_attach(subTable, label, 0, 1, 0 , 1, 0, 0, 0, 0); data->WBCombo = GTK_COMBO_BOX(gtk_combo_box_new_text()); data->WBPresets = NULL; *************** *** 1844,1848 **** g_signal_connect(G_OBJECT(data->WBCombo), "changed", G_CALLBACK(combo_update), CFG->wb); ! gtk_table_attach(subTable, GTK_WIDGET(data->WBCombo), 1, 6, 0, 1, GTK_FILL, 0, 0, 0); if (!make_model_match) { --- 1790,1797 ---- g_signal_connect(G_OBJECT(data->WBCombo), "changed", G_CALLBACK(combo_update), CFG->wb); ! event_box = gtk_event_box_new(); ! gtk_container_add(GTK_CONTAINER(event_box), GTK_WIDGET(data->WBCombo)); ! gtk_tooltips_set_tip(data->ToolTips, event_box, "White Balance", NULL); ! gtk_table_attach(subTable, event_box, 0, 6, 0, 1, GTK_FILL, 0, 0, 0); if (!make_model_match) { *************** *** 1868,1875 **** data->TemperatureAdjustment = adjustment_scale(subTable, 0, 1, ! "Temperature [K]", CFG->temperature, &CFG->temperature, 2000, 12000, 50, 200, 0, "White balance color temperature (K)"); ! data->GreenAdjustment = adjustment_scale(subTable, 0, 2, "Green component", CFG->green, &CFG->green, 0.2, 2.5, 0.01, 0.05, 2, "Green component"); --- 1817,1824 ---- data->TemperatureAdjustment = adjustment_scale(subTable, 0, 1, ! "Temperature", CFG->temperature, &CFG->temperature, 2000, 12000, 50, 200, 0, "White balance color temperature (K)"); ! data->GreenAdjustment = adjustment_scale(subTable, 0, 2, "Green", CFG->green, &CFG->green, 0.2, 2.5, 0.01, 0.05, 2, "Green component"); *************** *** 1904,1909 **** G_CALLBACK(adjustment_update), &CFG->chanMul[i]); } ! table = GTK_TABLE(table_with_frame(page, expanderText[color_expander], ! CFG->expander[color_expander])); for (j=0; j<profile_types; j++) { label = gtk_label_new(j==in_profile ? "Input profile" : --- 1853,1915 ---- G_CALLBACK(adjustment_update), &CFG->chanMul[i]); } ! /* End of White Balance setting page */ ! ! /* Start of Base Curve page */ ! page = table_with_frame(noteBox, "Base", TRUE); ! ! table = GTK_TABLE(table_with_frame(page, NULL, TRUE)); ! ! data->BaseCurveCombo = GTK_COMBO_BOX(gtk_combo_box_new_text()); ! /* Fill in the curve names, skipping custom and camera curves if there is ! * no cameraCurve. This will make some mess later with the counting */ ! for (i=0; i<CFG->BaseCurveCount; i++) ! if ( (i!=custom_curve && i!=camera_curve) || CFG_cameraCurve ) ! gtk_combo_box_append_text(data->BaseCurveCombo, ! CFG->BaseCurve[i].name); ! /* This is part of the mess with the combo_box counting */ ! if (CFG->BaseCurveIndex>camera_curve && !CFG_cameraCurve) ! gtk_combo_box_set_active(data->BaseCurveCombo, CFG->BaseCurveIndex-2); ! else ! gtk_combo_box_set_active(data->BaseCurveCombo, CFG->BaseCurveIndex); ! g_signal_connect(G_OBJECT(data->BaseCurveCombo), "changed", ! G_CALLBACK(combo_update), &CFG->BaseCurveIndex); ! gtk_table_attach(table, GTK_WIDGET(data->BaseCurveCombo), 0, 7, 0, 1, ! GTK_FILL, GTK_FILL, 0, 0); ! button = gtk_button_new(); ! gtk_container_add(GTK_CONTAINER(button), gtk_image_new_from_stock( ! GTK_STOCK_OPEN, GTK_ICON_SIZE_BUTTON)); ! gtk_table_attach(table, button, 7, 8, 0, 1, GTK_SHRINK, GTK_FILL, 0, 0); ! gtk_tooltips_set_tip(data->ToolTips, button, "Load base curve", NULL); ! g_signal_connect(G_OBJECT(button), "clicked", ! G_CALLBACK(load_curve), (gpointer)base_curve); ! button = gtk_button_new(); ! gtk_container_add(GTK_CONTAINER(button), gtk_image_new_from_stock( ! GTK_STOCK_SAVE_AS, GTK_ICON_SIZE_BUTTON)); ! gtk_tooltips_set_tip(data->ToolTips, button, "Save base curve", NULL); ! gtk_table_attach(table, button, 8, 9, 0, 1, GTK_SHRINK, GTK_FILL, 0, 0); ! g_signal_connect(G_OBJECT(button), "clicked", ! G_CALLBACK(save_curve), (gpointer)base_curve); ! ! data->BaseCurveWidget = curveeditor_widget_new(curveeditorHeight, 256, ! update_scales_callback, (gpointer)base_curve); ! curveeditor_widget_set_curve(data->BaseCurveWidget, ! &CFG->BaseCurve[CFG->BaseCurveIndex]); ! gtk_table_attach(table, data->BaseCurveWidget, 1, 8, 1, 8, ! GTK_EXPAND, 0, 0, 0); ! ! data->ResetBaseCurveButton = gtk_button_new(); ! gtk_container_add(GTK_CONTAINER(data->ResetBaseCurveButton), ! gtk_image_new_from_stock(GTK_STOCK_REFRESH, GTK_ICON_SIZE_BUTTON)); ! gtk_tooltips_set_tip(data->ToolTips, GTK_WIDGET(data->ResetBaseCurveButton), ! "Reset base curve to default",NULL); ! gtk_table_attach(table, GTK_WIDGET(data->ResetBaseCurveButton), 8, 9, 7, 8, ! 0, 0, 0, 0); ! g_signal_connect(G_OBJECT(data->ResetBaseCurveButton), "clicked", ! G_CALLBACK(button_update), NULL); ! /* End of Base Curve page */ ! ! /* Start of Color management page */ ! page = table_with_frame(noteBox, "Color", TRUE); ! table = GTK_TABLE(table_with_frame(page, NULL, TRUE)); for (j=0; j<profile_types; j++) { label = gtk_label_new(j==in_profile ? "Input profile" : *************** *** 1973,1977 **** G_CALLBACK(combo_update), &CFG->intent); gtk_table_attach(table, GTK_WIDGET(combo), 1, 7, 6, 7, GTK_FILL, 0, 0, 0); ! /* End of Color setting page */ /* Start of Corrections page */ --- 1979,1983 ---- G_CALLBACK(combo_update), &CFG->intent); gtk_table_attach(table, GTK_WIDGET(combo), 1, 7, 6, 7, GTK_FILL, 0, 0, 0); ! /* End of Color management page */ /* Start of Corrections page */ |
|
From: Udi F. <udi...@us...> - 2006-02-11 13:19:09
|
Update of /cvsroot/ufraw/ufraw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24314 Modified Files: ufraw_routines.c Log Message: Added WB presets from the Canon S60. Index: ufraw_routines.c =================================================================== RCS file: /cvsroot/ufraw/ufraw/ufraw_routines.c,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** ufraw_routines.c 9 Feb 2006 17:34:32 -0000 1.37 --- ufraw_routines.c 11 Feb 2006 13:18:56 -0000 1.38 *************** *** 267,270 **** --- 267,277 ---- { "Canon", "EOS-1D Mark II", "Tungsten", { 1.415480, 1, 2.160142, 0} }, + { "Canon", "PowerShot S50", "Day Light", { 1.772506, 1, 1.536496, 0 } }, + { "Canon", "PowerShot S50", "Cloudy", { 1.831311, 1, 1.484223, 0 } }, + { "Canon", "PowerShot S50", "Tungsten", { 1.185542, 1, 2.480723, 0 } }, + { "Canon", "PowerShot S50", "Fluorescent", { 1.706410, 1, 2.160256, 0 } }, + { "Canon", "PowerShot S50", "Fluorescent H", { 1.562500, 1, 1.817402, 0 } }, + { "Canon", "PowerShot S50", "Flash", { 1.776156, 1, 1.531630, 0 } }, + { "FUJIFILM", "FinePix S5000", "Incandescent", { 1.212081, 1, 2.672364, 0 } }, { "FUJIFILM", "FinePix S5000", "Fluorescent", { 1.772316, 1, 2.349902, 0 } }, |
|
From: Udi F. <udi...@us...> - 2006-02-09 17:34:41
|
Update of /cvsroot/ufraw/ufraw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15841 Modified Files: ufraw_routines.c Log Message: Add WB presets for the Panasonic FZ30. Index: ufraw_routines.c =================================================================== RCS file: /cvsroot/ufraw/ufraw/ufraw_routines.c,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** ufraw_routines.c 9 Feb 2006 00:27:47 -0000 1.36 --- ufraw_routines.c 9 Feb 2006 17:34:32 -0000 1.37 *************** *** 293,296 **** --- 293,301 ---- { "LEICA", "DIGILUX 2", "B/W", { 1.632812, 1, 1.550781, 0 } }, + { "Panasonic", "DMC-FZ30", "Sunny", { 1.757576, 1, 1.446970, 0 } }, + { "Panasonic", "DMC-FZ30", "Cloudy", { 1.943182, 1, 1.276515, 0 } }, + { "Panasonic", "DMC-FZ30", "Fluorescent", { 1.098485, 1, 2.106061, 0 } }, + { "Panasonic", "DMC-FZ30", "Flash", { 1.965909, 1, 1.303030, 0 } }, + }; const int wb_preset_count = sizeof(wb_preset) / sizeof(wb_data); |
|
From: Niels K. B. J. <nk...@us...> - 2006-02-09 05:50:30
|
Update of /cvsroot/ufraw/ufraw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29546 Modified Files: dcraw.c Log Message: DCRaw modified 8.05 (1.315). Index: dcraw.c =================================================================== RCS file: /cvsroot/ufraw/ufraw/dcraw.c,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** dcraw.c 7 Feb 2006 07:32:15 -0000 1.59 --- dcraw.c 9 Feb 2006 05:50:22 -0000 1.60 *************** *** 3419,3422 **** --- 3419,3423 ---- !strncmp (buf,"KDK" ,3) || !strncmp (buf,"MLY" ,3) || + !strncmp (buf,"VER" ,3) || !strncmp (buf,"IIII",4) || !strncmp (buf,"MMMM",4)) return; *************** *** 3443,3446 **** --- 3444,3448 ---- entries = get2(); + if (entries > 1000) return; while (entries--) { tiff_get (base, &tag, &type, &len, &save); *************** *** 4020,4028 **** } } ! if (((strstr(make,"Minolta") || strstr(make,"MINOLTA")) && tiff_bps == 8) ! || (!strncmp(make,"NIKON",5) && filters == UINT_MAX) ! || (!strcmp(make,"SONY") && tiff_bps != 14) ! || (!strcmp(make,"Canon") && tiff_bps == 8) ! || (tiff_samples == 3 && data_offset == 8)) if (!dng_version) is_raw = 0; for (i=0; i < tiff_nifds; i++) --- 4022,4026 ---- } } ! if (tiff_samples == 3 && tiff_bps == 8) if (!dng_version) is_raw = 0; for (i=0; i < tiff_nifds; i++) *************** *** 6108,6112 **** { fprintf (stderr, ! "\nRaw Photo Decoder \"dcraw\" v8.04" "\nby Dave Coffin, dcoffin a cybercom o net" "\n\nUsage: %s [options] file1 file2 ...\n" --- 6106,6110 ---- { fprintf (stderr, ! "\nRaw Photo Decoder \"dcraw\" v8.05" "\nby Dave Coffin, dcoffin a cybercom o net" "\n\nUsage: %s [options] file1 file2 ...\n" |
|
From: Niels K. B. J. <nk...@us...> - 2006-02-09 05:49:23
|
Update of /cvsroot/ufraw/ufraw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29043 Modified Files: Tag: dcraw-original-branch dcraw.c Log Message: DCRaw original 8.05 (1.315). Index: dcraw.c =================================================================== RCS file: /cvsroot/ufraw/ufraw/dcraw.c,v retrieving revision 1.1.2.35 retrieving revision 1.1.2.36 diff -C2 -d -r1.1.2.35 -r1.1.2.36 *** dcraw.c 7 Feb 2006 07:12:30 -0000 1.1.2.35 --- dcraw.c 9 Feb 2006 05:49:15 -0000 1.1.2.36 *************** *** 3390,3393 **** --- 3390,3394 ---- !strncmp (buf,"KDK" ,3) || !strncmp (buf,"MLY" ,3) || + !strncmp (buf,"VER" ,3) || !strncmp (buf,"IIII",4) || !strncmp (buf,"MMMM",4)) return; *************** *** 3414,3417 **** --- 3415,3419 ---- entries = get2(); + if (entries > 1000) return; while (entries--) { tiff_get (base, &tag, &type, &len, &save); *************** *** 3984,3992 **** } } ! if (((strstr(make,"Minolta") || strstr(make,"MINOLTA")) && tiff_bps == 8) ! || (!strncmp(make,"NIKON",5) && filters == UINT_MAX) ! || (!strcmp(make,"SONY") && tiff_bps != 14) ! || (!strcmp(make,"Canon") && tiff_bps == 8) ! || (tiff_samples == 3 && data_offset == 8)) if (!dng_version) is_raw = 0; for (i=0; i < tiff_nifds; i++) --- 3986,3990 ---- } } ! if (tiff_samples == 3 && tiff_bps == 8) if (!dng_version) is_raw = 0; for (i=0; i < tiff_nifds; i++) *************** *** 6066,6070 **** { fprintf (stderr, ! "\nRaw Photo Decoder \"dcraw\" v8.04" "\nby Dave Coffin, dcoffin a cybercom o net" "\n\nUsage: %s [options] file1 file2 ...\n" --- 6064,6068 ---- { fprintf (stderr, ! "\nRaw Photo Decoder \"dcraw\" v8.05" "\nby Dave Coffin, dcoffin a cybercom o net" "\n\nUsage: %s [options] file1 file2 ...\n" |
|
From: Udi F. <udi...@us...> - 2006-02-09 00:27:55
|
Update of /cvsroot/ufraw/ufraw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11935 Modified Files: ufraw_routines.c ufraw_ufraw.c Log Message: Added WB presets for Olumpus E-1 and Leica Digilux 2. For Nikon D1X images stretch the pixels before shrinking the image to improve shrank image quality. Index: ufraw_routines.c =================================================================== RCS file: /cvsroot/ufraw/ufraw/ufraw_routines.c,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** ufraw_routines.c 8 Feb 2006 17:35:11 -0000 1.35 --- ufraw_routines.c 9 Feb 2006 00:27:47 -0000 1.36 *************** *** 213,220 **** { "Minolta", "DiMAGE 7Hi", "Cloudy", { 1.730469, 1, 1.269531, 0 } }, /* 5823K */ ! { "Minolta", "DiMAGE G500", "sun", { 1.496094, 1, 1.121094, 0 } }, ! { "Minolta", "DiMAGE G500", "cloudy", { 1.527344, 1, 1.105469, 0 } }, ! { "Minolta", "DiMAGE G500", "luminescent", { 1.382813, 1, 1.347656, 0 } }, ! { "Minolta", "DiMAGE G500", "lamp", { 1.042969, 1, 1.859375, 0 } }, { "Canon", "EOS DIGITAL REBEL XT", "Tungsten", { 1.554250, 1, 2.377034, 0 } }, --- 213,220 ---- { "Minolta", "DiMAGE 7Hi", "Cloudy", { 1.730469, 1, 1.269531, 0 } }, /* 5823K */ ! { "Minolta", "DiMAGE G500", "Sun", { 1.496094, 1, 1.121094, 0 } }, ! { "Minolta", "DiMAGE G500", "Cloudy", { 1.527344, 1, 1.105469, 0 } }, ! { "Minolta", "DiMAGE G500", "Luminescent", { 1.382813, 1, 1.347656, 0 } }, ! { "Minolta", "DiMAGE G500", "Lamp", { 1.042969, 1, 1.859375, 0 } }, { "Canon", "EOS DIGITAL REBEL XT", "Tungsten", { 1.554250, 1, 2.377034, 0 } }, *************** *** 272,276 **** { "FUJIFILM", "FinePix S5000", "Flash", { 2.202181, 1, 1.423284, 0 } }, { "FUJIFILM", "FinePix S5000", "Cloudy", { 2.036578, 1, 1.382513, 0 } }, ! { "FUJIFILM", "FinePix S5000", "Shade", { 2.357215, 1, 1.212016, 0 } } }; const int wb_preset_count = sizeof(wb_preset) / sizeof(wb_data); --- 272,296 ---- { "FUJIFILM", "FinePix S5000", "Flash", { 2.202181, 1, 1.423284, 0 } }, { "FUJIFILM", "FinePix S5000", "Cloudy", { 2.036578, 1, 1.382513, 0 } }, ! { "FUJIFILM", "FinePix S5000", "Shade", { 2.357215, 1, 1.212016, 0 } }, ! ! { "OLYMPUS", "E-1", "3000K Tungsten", { 1, 1.024000, 1.992000, 0 } }, ! { "OLYMPUS", "E-1", "3300K", { 1.070312, 1, 1.773438, 0 } }, ! { "OLYMPUS", "E-1", "3600K Incandesent", { 1.156250, 1, 1.640625, 0 } }, ! { "OLYMPUS", "E-1", "3900K", { 1.234375, 1, 1.523438, 0 } }, ! { "OLYMPUS", "E-1", "4000K White fluorescent", { 2.062500, 1, 1.679688, 0 } }, ! { "OLYMPUS", "E-1", "4300K", { 1.414062, 1, 1.343750, 0 } }, ! { "OLYMPUS", "E-1", "4500K Neutral fluorescent", { 1.835938, 1, 1.320312, 0 } }, ! { "OLYMPUS", "E-1", "4800K", { 1.546875, 1, 1.226562, 0 } }, ! { "OLYMPUS", "E-1", "5300K Clear day", { 1.664062, 1, 1.140625, 0 } }, ! { "OLYMPUS", "E-1", "6000K Cloudy (with flash)", { 1.796875, 1, 1.046875, 0 } }, ! { "OLYMPUS", "E-1", "6600K Daylight fluorescent", { 2.101562, 1, 1.085938, 0 } }, ! { "OLYMPUS", "E-1", "7500K Shadows", { 2.196581, 1.094017, 1, 0 } }, ! ! { "LEICA", "DIGILUX 2", "Sunshine", { 1.628906, 1, 1.488281, 0 } }, ! { "LEICA", "DIGILUX 2", "Cloudy", { 1.835938, 1, 1.343750, 0 } }, ! { "LEICA", "DIGILUX 2", "Indoor Halogen", { 1.078125, 1, 2.203125, 0 } }, ! { "LEICA", "DIGILUX 2", "Flash", { 2.074219, 1, 1.304688, 0 } }, ! { "LEICA", "DIGILUX 2", "B/W", { 1.632812, 1, 1.550781, 0 } }, ! }; const int wb_preset_count = sizeof(wb_preset) / sizeof(wb_data); Index: ufraw_ufraw.c =================================================================== RCS file: /cvsroot/ufraw/ufraw/ufraw_ufraw.c,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** ufraw_ufraw.c 5 Feb 2006 17:52:26 -0000 1.34 --- ufraw_ufraw.c 9 Feb 2006 00:27:47 -0000 1.35 *************** *** 337,348 **** conf_data *conf = uf->conf; dcraw_image_data final; preview_progress(uf->widget, "Loading image", 0.1); if ( conf->interpolation==half_interpolation || ! ( conf->size==0 && conf->shrink>1 ) || ( conf->size>0 && conf->size<MAX(raw->raw.height, raw->raw.width) ) || ( raw->filters==0 ) ) { ! dcraw_finalize_shrink(&final, raw, MAX(conf->shrink,1<<raw->shrink)); uf->image.height = final.height; --- 337,358 ---- conf_data *conf = uf->conf; dcraw_image_data final; + int shrink = 1; preview_progress(uf->widget, "Loading image", 0.1); + /* We can do a simple interpolation in the following cases: + * We shrink by an integer value. + * If there is a ymag (D1X) shrink must be at least 4. + * Wanted size is smaller than raw size (size is after a raw->shrink). + * There are no filters (Foveon). */ if ( conf->interpolation==half_interpolation || ! ( conf->size==0 && conf->shrink/raw->ymag>1 ) || ( conf->size>0 && conf->size<MAX(raw->raw.height, raw->raw.width) ) || ( raw->filters==0 ) ) { ! if (conf->size==0 && conf->shrink%raw->ymag==0) ! shrink = conf->shrink / raw->ymag; ! else if (raw->filters!=0) ! shrink = 2; ! dcraw_finalize_shrink(&final, raw, shrink); uf->image.height = final.height; *************** *** 390,393 **** --- 400,409 ---- uf->image.image = final.image; } + if (raw->ymag==2) { + dcraw_image_stretch(&final, raw->ymag); + if (conf->size==0 && conf->shrink>1) + dcraw_image_resize(&final, + shrink*MAX(final.height, final.width)/conf->shrink); + } if (conf->size>0) { if ( conf->size>MAX(final.height, final.width) ) { *************** *** 399,403 **** } preview_progress(uf->widget, "Loading image", 0.4); - dcraw_image_stretch(&final, raw->ymag); uf->image.image = final.image; dcraw_flip_image(&final, raw->flip); --- 415,418 ---- |
|
From: Udi F. <udi...@us...> - 2006-02-08 17:35:23
|
Update of /cvsroot/ufraw/ufraw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13659 Modified Files: ufraw_routines.c Log Message: Added WB presets for the Canon 20D. Added in comments fit functions for a real blackbody. Index: ufraw_routines.c =================================================================== RCS file: /cvsroot/ufraw/ufraw/ufraw_routines.c,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** ufraw_routines.c 8 Feb 2006 08:35:31 -0000 1.34 --- ufraw_routines.c 8 Feb 2006 17:35:11 -0000 1.35 *************** *** 253,256 **** --- 253,263 ---- { "Canon", "EOS 10D", "Flash", { 2.385817, 1, 1.115385, 0 } }, + { "Canon", "EOS 20D", "Daylight", { 1.954680, 1, 1.478818, 0} }, + { "Canon", "EOS 20D", "Shade", { 2.248276, 1, 1.227586, 0} }, + { "Canon", "EOS 20D", "Cloudy", { 2.115271, 1, 1.336946, 0} }, + { "Canon", "EOS 20D", "Tungsten", { 1.368087, 1, 2.417044, 0} }, + { "Canon", "EOS 20D", "Fluorescent", { 1.752709, 1, 2.060098, 0} }, + { "Canon", "EOS 20D", "Flash", { 2.145813, 1, 1.293596, 0} }, + { "Canon", "EOS-1D Mark II", "Cloudy", { 2.093750, 1, 1.166016, 0} }, { "Canon", "EOS-1D Mark II", "Daylight", { 1.957031, 1, 1.295898, 0} }, *************** *** 322,327 **** /* Convert between Temperature and RGB. * Base on information from http://www.brucelindbloom.com/ ! * The generalization to 2000K < T < 4000K is my own and ! * should be taken with a grain of salt. */ const double XYZ_to_RGB[3][3] = { --- 329,335 ---- /* Convert between Temperature and RGB. * Base on information from http://www.brucelindbloom.com/ ! * The fit for D-illuminant between 4000K and 12000K are from CIE ! * The generalization to 2000K < T < 4000K and the blackbody fits ! * are my own and should be taken with a grain of salt. */ const double XYZ_to_RGB[3][3] = { *************** *** 334,337 **** --- 342,346 ---- int c; double xD, yD, X, Y, Z, max; + // Fit for CIE Daylight illuminant if (T<= 4000) { xD = 0.27475e9/(T*T*T) - 0.98598e6/(T*T) + 1.17444e3/T + 0.145986; *************** *** 342,345 **** --- 351,363 ---- } yD = -3*xD*xD + 2.87*xD - 0.275; + + // Fit for Blackbody using CIE standard observer function at 2 degrees + //xD = -1.8596e9/(T*T*T) + 1.37686e6/(T*T) + 0.360496e3/T + 0.232632; + //yD = -2.6046*xD*xD + 2.6106*xD - 0.239156; + + // Fit for Blackbody using CIE standard observer function at 10 degrees + //xD = -1.98883e9/(T*T*T) + 1.45155e6/(T*T) + 0.364774e3/T + 0.231136; + //yD = -2.35563*xD*xD + 2.39688*xD - 0.196035; + X = xD/yD; Y = 1; |
|
From: Udi F. <udi...@us...> - 2006-02-08 08:35:41
|
Update of /cvsroot/ufraw/ufraw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4678 Modified Files: ufraw_routines.c Log Message: Added WB presets for Canon 1D Mark II and Minolta G500 Index: ufraw_routines.c =================================================================== RCS file: /cvsroot/ufraw/ufraw/ufraw_routines.c,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** ufraw_routines.c 8 Feb 2006 05:32:54 -0000 1.33 --- ufraw_routines.c 8 Feb 2006 08:35:31 -0000 1.34 *************** *** 200,209 **** { "NIKON", "D2X", "10000K", { 2.17578, 1, 1.18359, 0 } }, ! { "MINOLTA", "DYNAX 7D", "Daylight", { 1.621094, 1, 1.601562, 0 } }, ! { "MINOLTA", "DYNAX 7D", "Shade", { 1.855469, 1, 1.402344, 0 } }, ! { "MINOLTA", "DYNAX 7D", "Cloudy", { 1.738281, 1, 1.464844, 0 } }, ! { "MINOLTA", "DYNAX 7D", "Tungsten", { 0.945312, 1, 3.292969, 0 } }, ! { "MINOLTA", "DYNAX 7D", "Fluorescent", { 1.570312, 1, 2.453125, 0 } }, ! { "MINOLTA", "DYNAX 7D", "Flash", { 1.890625, 1, 1.445312, 0 } }, { "Minolta", "DiMAGE 7Hi", "Daylight", { 1.609375, 1, 1.328125, 0 } }, /* 5500K */ --- 200,209 ---- { "NIKON", "D2X", "10000K", { 2.17578, 1, 1.18359, 0 } }, ! { "MINOLTA", "DYNAX 7D", "Cloudy", { 1.738281, 1, 1.464844, 0} }, ! { "MINOLTA", "DYNAX 7D", "Daylight", { 1.621094, 1, 1.601562, 0} }, ! { "MINOLTA", "DYNAX 7D", "Flash", { 1.890625, 1, 1.445312, 0} }, ! { "MINOLTA", "DYNAX 7D", "Fluorescent", { 1.570312, 1, 2.453125, 0} }, ! { "MINOLTA", "DYNAX 7D", "Shade", { 1.855469, 1, 1.402344, 0} }, ! { "MINOLTA", "DYNAX 7D", "Tungsten", { 0.945312, 1, 3.292969, 0} }, { "Minolta", "DiMAGE 7Hi", "Daylight", { 1.609375, 1, 1.328125, 0 } }, /* 5500K */ *************** *** 213,216 **** --- 213,221 ---- { "Minolta", "DiMAGE 7Hi", "Cloudy", { 1.730469, 1, 1.269531, 0 } }, /* 5823K */ + { "Minolta", "DiMAGE G500", "sun", { 1.496094, 1, 1.121094, 0 } }, + { "Minolta", "DiMAGE G500", "cloudy", { 1.527344, 1, 1.105469, 0 } }, + { "Minolta", "DiMAGE G500", "luminescent", { 1.382813, 1, 1.347656, 0 } }, + { "Minolta", "DiMAGE G500", "lamp", { 1.042969, 1, 1.859375, 0 } }, + { "Canon", "EOS DIGITAL REBEL XT", "Tungsten", { 1.554250, 1, 2.377034, 0 } }, { "Canon", "EOS DIGITAL REBEL XT", "Daylight", { 2.392927, 1, 1.487230, 0 } }, *************** *** 248,251 **** --- 253,263 ---- { "Canon", "EOS 10D", "Flash", { 2.385817, 1, 1.115385, 0 } }, + { "Canon", "EOS-1D Mark II", "Cloudy", { 2.093750, 1, 1.166016, 0} }, + { "Canon", "EOS-1D Mark II", "Daylight", { 1.957031, 1, 1.295898, 0} }, + { "Canon", "EOS-1D Mark II", "Flash", { 2.225586, 1, 1.172852, 0} }, + { "Canon", "EOS-1D Mark II", "Fluorescent", { 1.785853, 1, 1.785853, 0} }, + { "Canon", "EOS-1D Mark II", "Shade", { 2.220703, 1, 1.069336, 0} }, + { "Canon", "EOS-1D Mark II", "Tungsten", { 1.415480, 1, 2.160142, 0} }, + { "FUJIFILM", "FinePix S5000", "Incandescent", { 1.212081, 1, 2.672364, 0 } }, { "FUJIFILM", "FinePix S5000", "Fluorescent", { 1.772316, 1, 2.349902, 0 } }, |
|
From: Niels K. B. J. <nk...@us...> - 2006-02-08 05:33:02
|
Update of /cvsroot/ufraw/ufraw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30959 Modified Files: ufraw_routines.c Log Message: Add WB presets for MINOLTA DYNAX 7D. Index: ufraw_routines.c =================================================================== RCS file: /cvsroot/ufraw/ufraw/ufraw_routines.c,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** ufraw_routines.c 7 Feb 2006 05:22:31 -0000 1.32 --- ufraw_routines.c 8 Feb 2006 05:32:54 -0000 1.33 *************** *** 200,203 **** --- 200,210 ---- { "NIKON", "D2X", "10000K", { 2.17578, 1, 1.18359, 0 } }, + { "MINOLTA", "DYNAX 7D", "Daylight", { 1.621094, 1, 1.601562, 0 } }, + { "MINOLTA", "DYNAX 7D", "Shade", { 1.855469, 1, 1.402344, 0 } }, + { "MINOLTA", "DYNAX 7D", "Cloudy", { 1.738281, 1, 1.464844, 0 } }, + { "MINOLTA", "DYNAX 7D", "Tungsten", { 0.945312, 1, 3.292969, 0 } }, + { "MINOLTA", "DYNAX 7D", "Fluorescent", { 1.570312, 1, 2.453125, 0 } }, + { "MINOLTA", "DYNAX 7D", "Flash", { 1.890625, 1, 1.445312, 0 } }, + { "Minolta", "DiMAGE 7Hi", "Daylight", { 1.609375, 1, 1.328125, 0 } }, /* 5500K */ { "Minolta", "DiMAGE 7Hi", "Tungsten", { 0.878906, 1, 2.433594, 0 } }, /* 2800K */ |
|
From: Niels K. B. J. <nk...@us...> - 2006-02-07 07:35:49
|
Update of /cvsroot/ufraw/ufraw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23868 Modified Files: dcraw_api.c Log Message: Update API for DCRaw 8.04 (1.314). Index: dcraw_api.c =================================================================== RCS file: /cvsroot/ufraw/ufraw/dcraw_api.c,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** dcraw_api.c 4 Feb 2006 20:36:27 -0000 1.32 --- dcraw_api.c 7 Feb 2006 07:35:41 -0000 1.33 *************** *** 181,185 **** bad_pixels(); if (is_foveon) { - maximum = 0x0fff; /* Fix for dark foveon images. */ foveon_interpolate(); h->raw.width = width; --- 181,184 ---- |
11 messages has been excluded from this view by a project administrator.