Hello community, here is the log from the commit of package ufraw checked in at Wed Mar 29 16:55:51 CEST 2006. -------- --- ufraw/ufraw.changes 2006-03-27 00:23:41.000000000 +0200 +++ ufraw/ufraw.changes 2006-03-29 15:30:01.000000000 +0200 @@ -1,0 +2,8 @@ +Wed Mar 29 15:19:23 CEST 2006 - postadal@suse.cz + +- handled 'spot_wb' in --conf correctly [ufraw#1456944] (config2.patch) +- updated dcraw to 8.10 (1.320) (wb.patch) + * better support the Imacon Ixpress 22-Mp + * added WB support for Olympus C5060WZ and C8080WZ + +------------------------------------------------------------------- @@ -4 +12 @@ -- fixed converting old config [ufraw#1456944] (config.patch) +- fixed converting old config [ufraw#1456944] (config.patch) New: ---- ufraw-0.7-config2.patch ufraw-0.7-wb.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ufraw.spec ++++++ --- /var/tmp/diff_new_pack.WoAelJ/_old 2006-03-29 16:55:00.000000000 +0200 +++ /var/tmp/diff_new_pack.WoAelJ/_new 2006-03-29 16:55:00.000000000 +0200 @@ -25,12 +25,14 @@ Suggests: dcraw-gnome %endif Version: 0.7.020060326 -Release: 2 +Release: 3 %define vversion 0.7 Summary: The Unidentified Flying Raw Source: %{name}-%{version}.tar.bz2 Patch: %{name}-0.6-desktop.patch Patch1: %{name}-0.7-config.patch +Patch2: %{name}-0.7-config2.patch +Patch3: %{name}-0.7-wb.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -67,6 +69,8 @@ %setup -q -n %{name} %patch %patch1 +%patch2 +%patch3 %build %{suse_update_config -f} @@ -106,6 +110,11 @@ %_gimpplugindir/plug-ins/ %changelog -n ufraw +* Wed Mar 29 2006 - postadal@suse.cz +- handled 'spot_wb' in --conf correctly [ufraw#1456944] (config2.patch) +- updated dcraw to 8.10 (1.320) (wb.patch) + * better support the Imacon Ixpress 22-Mp + * added WB support for Olympus C5060WZ and C8080WZ * Mon Mar 27 2006 - postadal@suse.cz - fixed converting old config [ufraw#1456944] (config.patch) * Sun Mar 26 2006 - postadal@suse.cz ++++++ ufraw-0.7-config2.patch ++++++ --- ufraw_conf.c +++ ufraw_conf.c @@ -878,6 +880,10 @@ dst->temperature = src->temperature; dst->green = src->green; for (i=0; i<4; i++) dst->chanMul[i] = src->chanMul[i]; + /* make and model are 'part of' ChanMul, + * since on different make and model ChanMul are meaningless */ + g_strlcpy(dst->make, src->make, max_name); + g_strlcpy(dst->model, src->model, max_name); dst->exposure = src->exposure; dst->saturation = src->saturation; dst->black = src->black; --- dcraw_api.c +++ dcraw_api.c @@ -398,7 +398,7 @@ if (interpolation==dcraw_ahd_interpolation && h->colors > 3) interpolation = dcraw_vng_interpolation; f4 = h->fourColorFilters; - if (rgbWB[3]==0) rgbWB[3] = rgbWB[1]; + if (h->colors==3) rgbWB[3] = rgbWB[1]; for(r=0; r<h->height; r++) for(c=0; c<h->width; c++) f->image[r*f->width+c][FC(ff,r,c)] = MIN( MAX( (gint64) ++++++ ufraw-0.7-wb.patch ++++++ --- dcraw.c +++ dcraw.c @@ -19,8 +19,8 @@ copy them from an earlier, non-GPL Revision of dcraw.c, or (c) purchase a license from the author. - $Revision: 1.319 $ - $Date: 2006/03/24 07:03:04 $ + $Revision: 1.320 $ + $Date: 2006/03/29 02:44:05 $ */ #define _GNU_SOURCE @@ -3898,8 +3898,11 @@ case 46275: strcpy (make, "Imacon"); data_offset = ftell(ifp); - raw_width = 4090; - raw_height = len / raw_width / 2; + break; + case 46279: + fseek (ifp, 78, SEEK_CUR); + raw_width = get4(); + raw_height = get4(); break; case 50454: /* Sinar tag */ case 50455: @@ -5568,12 +5571,14 @@ model[0] = 0; } } else if (!strcmp(make,"Imacon")) { - height = raw_height - 6; - width = raw_width - 10; - data_offset += 6 + raw_width*12; - flip = height > width+10 ? 5:3; sprintf (model, "Ixpress %d-Mp", height*width/1000000); - filters = 0x61616161; + if (raw_width < 4096) { + data_offset += 6 + raw_width*12; + height = raw_height - 6; + width = raw_width - 10; + filters = 0x61616161; + flip = height > width+10 ? 5:3; + } load_raw = unpacked_load_raw; maximum = 0xffff; pre_mul[0] = 1.963; @@ -6177,7 +6182,7 @@ if (argc == 1) { fprintf (stderr, - "\nRaw Photo Decoder \"dcraw\" v8.09" + "\nRaw Photo Decoder \"dcraw\" v8.10" "\nby Dave Coffin, dcoffin a cybercom o net" "\n\nUsage: %s [options] file1 file2 ...\n" "\nValid options:" --- nikon_curve.c +++ nikon_curve.c @@ -28,6 +28,7 @@ #include "ufraw.h" #else #define MAX(a,b) ((a) > (b) ? (a) : (b)) + #define MIN(a,b) ((a) < (b) ? (a) : (b)) #endif /************************************************* @@ -941,7 +942,7 @@ **********************************************/ int CurveDataSample(CurveData *curve, CurveSample *sample) { - unsigned int i = 0, n; + int i = 0, n; double x[20]; double y[20]; @@ -965,7 +966,7 @@ } else { - for(i = 0; i < (unsigned int)curve->m_numAnchors; i++) + for(i = 0; i < curve->m_numAnchors; i++) { x[i] = curve->m_anchors[i].x*box_width + curve->m_min_x; y[i] = curve->m_anchors[i].y*box_height + curve->m_min_y; @@ -987,7 +988,7 @@ double yppval = 0; //Now build a table - double val = 0; + int val; double res = 1.0/(double)sample->m_samplingRes; //allocate enough space for the samples @@ -995,46 +996,41 @@ sample->m_samplingRes*sizeof(int)); DEBUG_PRINT("DEBUG: SAMPLING OUTPUT RANGE: 0 -> %u\n", sample->m_outputRes); - //release old sample allocation if it exists - if (sample->m_Samples!=NULL) - { - free(sample->m_Samples); - } - sample->m_Samples = (unsigned int *)calloc(sample->m_samplingRes, sizeof(int)); + sample->m_Samples = (unsigned int *)realloc(sample->m_Samples, + sample->m_samplingRes * sizeof(int)); - for(i = 0; i < sample->m_samplingRes; i++) + int firstPointX = curve->m_anchors[0].x * sample->m_samplingRes; + int firstPointY = pow(curve->m_anchors[0].y, gamma) * + sample->m_outputRes; + int lastPointX = curve->m_anchors[curve->m_numAnchors-1].x * + sample->m_samplingRes; + int lastPointY = pow(curve->m_anchors[curve->m_numAnchors-1].y, gamma) * + sample->m_outputRes; + int maxY = curve->m_max_y * sample->m_outputRes; + int minY = curve->m_min_y * sample->m_outputRes; + + for(i = 0; i < (int)sample->m_samplingRes; i++) { //get the value of the curve at a point //take into account that curves may not necessarily begin at x = 0.0 //nor end at x = 1.0 //Before the first point and after the last point, take a strait line - if (i*res < curve->m_anchors[0].x) { - val = pow(curve->m_anchors[0].y, gamma); - } else if (i*res > curve->m_anchors[curve->m_numAnchors-1].x) { - val = pow(curve->m_anchors[curve->m_numAnchors-1].y, gamma); + if (i < firstPointX) { + sample->m_Samples[i] = firstPointY; + } else if (i > lastPointX) { + sample->m_Samples[i] = lastPointY; } else { //within range, we can sample the curve - val = spline_cubic_val ( n, x, i*res, y, - ypp, &ypval, &yppval ); + if (gamma==1.0) + val = spline_cubic_val( n, x, i*res, y, + ypp, &ypval, &yppval ) * sample->m_outputRes; + else + val = pow(spline_cubic_val( n, x, i*res, y, + ypp, &ypval, &yppval ), gamma) * sample->m_outputRes; - //Compensate for gamma. - val = pow(val,gamma); - - //cap at the high end of the range - if (val > curve->m_max_y) - { - val = curve->m_max_y; - } - //cap at the low end of the range - else if (val < curve->m_min_y) - { - val = curve->m_min_y; - } + sample->m_Samples[i] = MIN(MAX(val,minY),maxY); } - - //save the sample - sample->m_Samples[i] = (unsigned int)floor(val*sample->m_outputRes); } free(ypp); --- wb_presets.c +++ wb_presets.c @@ -393,6 +393,170 @@ { "NIKON", "D70", "Shade", 0, { 2.613281, 1, 1.277344, 0 } }, /* 8000K */ { "NIKON", "D70", "Shade", 3, { 2.394531, 1, 1.375000, 0 } }, + { "OLYMPUS", "C5060WZ", "Shade", 0, { 1.949219, 1, 1.195312, 0 } }, + { "OLYMPUS", "C5060WZ", "Cloudy", 0, { 1.621094, 1, 1.410156, 0 } }, + { "OLYMPUS", "C5060WZ", "Sunny", 0, { 1.511719, 1, 1.500000, 0 } }, + { "OLYMPUS", "C5060WZ", "Evening", 0, { 1.636719, 1, 1.496094, 0 } }, + { "OLYMPUS", "C5060WZ", "Fluorescent1", 0, { 1.734375, 1, 1.343750, 0 } }, + { "OLYMPUS", "C5060WZ", "Fluorescent2", 0, { 1.457031, 1, 1.691406, 0 } }, + { "OLYMPUS", "C5060WZ", "Fluorescent3", 0, { 1.417969, 1, 2.230469, 0 } }, + { "OLYMPUS", "C5060WZ", "Fluorescent4", 0, { 1, 1.103448, 3.422414, 0 } }, + { "OLYMPUS", "C5060WZ", "Incandescent", 0, { 1, 1.153153, 3.662162, 0 } }, + { "OLYMPUS", "C5060WZ", "Flash/Auto", 0, { 1.850000, 1, 1.308044, 0 } }, + + // Olympus C8080WZ - firmware 757-78 + { "OLYMPUS", "C8080WZ", "Shadows", -7, { 1.515625, 1.000000, 1.773438, 0 } }, + { "OLYMPUS", "C8080WZ", "Shadows", -6, { 1.671875, 1.000000, 1.691406, 0 } }, + { "OLYMPUS", "C8080WZ", "Shadows", -5, { 1.832031, 1.000000, 1.605469, 0 } }, + { "OLYMPUS", "C8080WZ", "Shadows", -4, { 1.988281, 1.000000, 1.523438, 0 } }, + { "OLYMPUS", "C8080WZ", "Shadows", -3, { 2.144531, 1.000000, 1.441406, 0 } }, + { "OLYMPUS", "C8080WZ", "Shadows", -2, { 2.300781, 1.000000, 1.355469, 0 } }, + { "OLYMPUS", "C8080WZ", "Shadows", -1, { 2.457031, 1.000000, 1.273438, 0 } }, + { "OLYMPUS", "C8080WZ", "Shadows", 0, { 2.617188, 1.000000, 1.191406, 0 } }, + { "OLYMPUS", "C8080WZ", "Shadows", 1, { 2.929688, 1.000000, 1.117188, 0 } }, + { "OLYMPUS", "C8080WZ", "Shadows", 2, { 3.242188, 1.000000, 1.046875, 0 } }, + { "OLYMPUS", "C8080WZ", "Shadows", 3, { 3.644000, 1.024000, 1.000000, 0 } }, + { "OLYMPUS", "C8080WZ", "Shadows", 4, { 4.290043, 1.108225, 1.000000, 0 } }, + { "OLYMPUS", "C8080WZ", "Shadows", 5, { 5.032864, 1.201878, 1.000000, 0 } }, + { "OLYMPUS", "C8080WZ", "Shadows", 6, { 5.907692, 1.312821, 1.000000, 0 } }, + { "OLYMPUS", "C8080WZ", "Shadows", 7, { 7.000000, 1.454545, 1.000000, 0 } }, + { "OLYMPUS", "C8080WZ", "Cloudy day", -7, { 1.277344, 1.000000, 2.164062, 0 } }, + { "OLYMPUS", "C8080WZ", "Cloudy day", -6, { 1.406250, 1.000000, 2.062500, 0 } }, + { "OLYMPUS", "C8080WZ", "Cloudy day", -5, { 1.539062, 1.000000, 1.960938, 0 } }, + { "OLYMPUS", "C8080WZ", "Cloudy day", -4, { 1.671875, 1.000000, 1.859375, 0 } }, + { "OLYMPUS", "C8080WZ", "Cloudy day", -3, { 1.804688, 1.000000, 1.757812, 0 } }, + { "OLYMPUS", "C8080WZ", "Cloudy day", -2, { 1.937500, 1.000000, 1.656250, 0 } }, + { "OLYMPUS", "C8080WZ", "Cloudy day", -1, { 2.070312, 1.000000, 1.554688, 0 } }, + { "OLYMPUS", "C8080WZ", "Cloudy day", 0, { 2.203125, 1.000000, 1.453125, 0 } }, + { "OLYMPUS", "C8080WZ", "Cloudy day", 1, { 2.464844, 1.000000, 1.363281, 0 } }, + { "OLYMPUS", "C8080WZ", "Cloudy day", 2, { 2.730469, 1.000000, 1.277344, 0 } }, + { "OLYMPUS", "C8080WZ", "Cloudy day", 3, { 2.996094, 1.000000, 1.191406, 0 } }, + { "OLYMPUS", "C8080WZ", "Cloudy day", 4, { 3.257812, 1.000000, 1.101562, 0 } }, + { "OLYMPUS", "C8080WZ", "Cloudy day", 5, { 3.523438, 1.000000, 1.015625, 0 } }, + { "OLYMPUS", "C8080WZ", "Cloudy day", 6, { 4.075630, 1.075630, 1.000000, 0 } }, + { "OLYMPUS", "C8080WZ", "Cloudy day", 7, { 4.823256, 1.190698, 1.000000, 0 } }, + { "OLYMPUS", "C8080WZ", "Sunny day", -7, { 1.234375, 1.000000, 2.343750, 0 } }, + { "OLYMPUS", "C8080WZ", "Sunny day", -6, { 1.359375, 1.000000, 2.234375, 0 } }, + { "OLYMPUS", "C8080WZ", "Sunny day", -5, { 1.488281, 1.000000, 2.125000, 0 } }, + { "OLYMPUS", "C8080WZ", "Sunny day", -4, { 1.617188, 1.000000, 2.011719, 0 } }, + { "OLYMPUS", "C8080WZ", "Sunny day", -3, { 1.742188, 1.000000, 1.902344, 0 } }, + { "OLYMPUS", "C8080WZ", "Sunny day", -2, { 1.871094, 1.000000, 1.792969, 0 } }, + { "OLYMPUS", "C8080WZ", "Sunny day", -1, { 2.000000, 1.000000, 1.683594, 0 } }, + { "OLYMPUS", "C8080WZ", "Sunny day", 0, { 2.128906, 1.000000, 1.574219, 0 } }, + { "OLYMPUS", "C8080WZ", "Sunny day", 1, { 2.382812, 1.000000, 1.476562, 0 } }, + { "OLYMPUS", "C8080WZ", "Sunny day", 2, { 2.636719, 1.000000, 1.382812, 0 } }, + { "OLYMPUS", "C8080WZ", "Sunny day", 3, { 2.894531, 1.000000, 1.289062, 0 } }, + { "OLYMPUS", "C8080WZ", "Sunny day", 4, { 3.148438, 1.000000, 1.195312, 0 } }, + { "OLYMPUS", "C8080WZ", "Sunny day", 5, { 3.406250, 1.000000, 1.101562, 0 } }, + { "OLYMPUS", "C8080WZ", "Sunny day", 6, { 3.660156, 1.000000, 1.003906, 0 } }, + { "OLYMPUS", "C8080WZ", "Sunny day", 7, { 4.300429, 1.098712, 1.000000, 0 } }, + { "OLYMPUS", "C8080WZ", "Evening sunlight", -7, { 1.308594, 1.000000, 2.199219, 0 } }, + { "OLYMPUS", "C8080WZ", "Evening sunlight", -6, { 1.445312, 1.000000, 2.093750, 0 } }, + { "OLYMPUS", "C8080WZ", "Evening sunlight", -5, { 1.582031, 1.000000, 1.992188, 0 } }, + { "OLYMPUS", "C8080WZ", "Evening sunlight", -4, { 1.718750, 1.000000, 1.886719, 0 } }, + { "OLYMPUS", "C8080WZ", "Evening sunlight", -3, { 1.851562, 1.000000, 1.785156, 0 } }, + { "OLYMPUS", "C8080WZ", "Evening sunlight", -2, { 1.988281, 1.000000, 1.679688, 0 } }, + { "OLYMPUS", "C8080WZ", "Evening sunlight", -1, { 2.125000, 1.000000, 1.578125, 0 } }, + { "OLYMPUS", "C8080WZ", "Evening sunlight", 0, { 2.261719, 1.000000, 1.476562, 0 } }, + { "OLYMPUS", "C8080WZ", "Evening sunlight", 1, { 2.531250, 1.000000, 1.386719, 0 } }, + { "OLYMPUS", "C8080WZ", "Evening sunlight", 2, { 2.800781, 1.000000, 1.296875, 0 } }, + { "OLYMPUS", "C8080WZ", "Evening sunlight", 3, { 3.074219, 1.000000, 1.207031, 0 } }, + { "OLYMPUS", "C8080WZ", "Evening sunlight", 4, { 3.343750, 1.000000, 1.121094, 0 } }, + { "OLYMPUS", "C8080WZ", "Evening sunlight", 5, { 3.617188, 1.000000, 1.031250, 0 } }, + { "OLYMPUS", "C8080WZ", "Evening sunlight", 6, { 4.128631, 1.062241, 1.000000, 0 } }, + { "OLYMPUS", "C8080WZ", "Evening sunlight", 7, { 4.863014, 1.168950, 1.000000, 0 } }, + { "OLYMPUS", "C8080WZ", "Flash (auto mode)", -7, { 1.488281, 1.000000, 2.214844, 0 } }, + { "OLYMPUS", "C8080WZ", "Flash (auto mode)", -6, { 1.652344, 1.000000, 2.105469, 0 } }, + { "OLYMPUS", "C8080WZ", "Flash (auto mode)", -5, { 1.812500, 1.000000, 1.992188, 0 } }, + { "OLYMPUS", "C8080WZ", "Flash (auto mode)", -4, { 1.976562, 1.000000, 1.882812, 0 } }, + { "OLYMPUS", "C8080WZ", "Flash (auto mode)", -3, { 2.117188, 1.000000, 1.773438, 0 } }, + { "OLYMPUS", "C8080WZ", "Flash (auto mode)", -2, { 2.253906, 1.000000, 1.675781, 0 } }, + { "OLYMPUS", "C8080WZ", "Flash (auto mode)", -1, { 2.425781, 1.000000, 1.585938, 0 } }, + { "OLYMPUS", "C8080WZ", "Flash (auto mode)", 0, { 2.570312, 1.000000, 1.468750, 0 } }, + { "OLYMPUS", "C8080WZ", "Flash (auto mode)", 1, { 2.890625, 1.000000, 1.386719, 0 } }, + { "OLYMPUS", "C8080WZ", "Flash (auto mode)", 2, { 3.199219, 1.000000, 1.308594, 0 } }, + { "OLYMPUS", "C8080WZ", "Flash (auto mode)", 3, { 3.500000, 1.000000, 1.214844, 0 } }, + { "OLYMPUS", "C8080WZ", "Flash (auto mode)", 4, { 3.820312, 1.000000, 1.125000, 0 } }, + { "OLYMPUS", "C8080WZ", "Flash (auto mode)", 5, { 4.128906, 1.000000, 1.039062, 0 } }, + { "OLYMPUS", "C8080WZ", "Flash (auto mode)", 6, { 4.711934, 1.053498, 1.000000, 0 } }, + { "OLYMPUS", "C8080WZ", "Flash (auto mode)", 7, { 5.450450, 1.153153, 1.000000, 0 } }, + { "OLYMPUS", "C8080WZ", "6700K Daylight fluorescent lamp", -7, { 1.425781, 1.000000, 2.097656, 0 } }, + { "OLYMPUS", "C8080WZ", "6700K Daylight fluorescent lamp", -6, { 1.574219, 1.000000, 2.000000, 0 } }, + { "OLYMPUS", "C8080WZ", "6700K Daylight fluorescent lamp", -5, { 1.722656, 1.000000, 1.902344, 0 } }, + { "OLYMPUS", "C8080WZ", "6700K Daylight fluorescent lamp", -4, { 1.867188, 1.000000, 1.804688, 0 } }, + { "OLYMPUS", "C8080WZ", "6700K Daylight fluorescent lamp", -3, { 2.015625, 1.000000, 1.703125, 0 } }, + { "OLYMPUS", "C8080WZ", "6700K Daylight fluorescent lamp", -2, { 2.164062, 1.000000, 1.605469, 0 } }, + { "OLYMPUS", "C8080WZ", "6700K Daylight fluorescent lamp", -1, { 2.312500, 1.000000, 1.507812, 0 } }, + { "OLYMPUS", "C8080WZ", "6700K Daylight fluorescent lamp", 0, { 2.460938, 1.000000, 1.410156, 0 } }, + { "OLYMPUS", "C8080WZ", "6700K Daylight fluorescent lamp", 1, { 2.753906, 1.000000, 1.324219, 0 } }, + { "OLYMPUS", "C8080WZ", "6700K Daylight fluorescent lamp", 2, { 3.050781, 1.000000, 1.238281, 0 } }, + { "OLYMPUS", "C8080WZ", "6700K Daylight fluorescent lamp", 3, { 3.343750, 1.000000, 1.156250, 0 } }, + { "OLYMPUS", "C8080WZ", "6700K Daylight fluorescent lamp", 4, { 3.640625, 1.000000, 1.070312, 0 } }, + { "OLYMPUS", "C8080WZ", "6700K Daylight fluorescent lamp", 5, { 4.000000, 1.015873, 1.000000, 0 } }, + { "OLYMPUS", "C8080WZ", "6700K Daylight fluorescent lamp", 6, { 4.688312, 1.108225, 1.000000, 0 } }, + { "OLYMPUS", "C8080WZ", "6700K Daylight fluorescent lamp", 7, { 5.545455, 1.224880, 1.000000, 0 } }, + { "OLYMPUS", "C8080WZ", "5000K Neutral fluorescent lamp", -7, { 1.195312, 1.000000, 2.589844, 0 } }, + { "OLYMPUS", "C8080WZ", "5000K Neutral fluorescent lamp", -6, { 1.316406, 1.000000, 2.464844, 0 } }, + { "OLYMPUS", "C8080WZ", "5000K Neutral fluorescent lamp", -5, { 1.441406, 1.000000, 2.343750, 0 } }, + { "OLYMPUS", "C8080WZ", "5000K Neutral fluorescent lamp", -4, { 1.566406, 1.000000, 2.222656, 0 } }, + { "OLYMPUS", "C8080WZ", "5000K Neutral fluorescent lamp", -3, { 1.687500, 1.000000, 2.101562, 0 } }, + { "OLYMPUS", "C8080WZ", "5000K Neutral fluorescent lamp", -2, { 1.812500, 1.000000, 1.980469, 0 } }, + { "OLYMPUS", "C8080WZ", "5000K Neutral fluorescent lamp", -1, { 1.937500, 1.000000, 1.859375, 0 } }, + { "OLYMPUS", "C8080WZ", "5000K Neutral fluorescent lamp", 0, { 2.062500, 1.000000, 1.738281, 0 } }, + { "OLYMPUS", "C8080WZ", "5000K Neutral fluorescent lamp", 1, { 2.308594, 1.000000, 1.632812, 0 } }, + { "OLYMPUS", "C8080WZ", "5000K Neutral fluorescent lamp", 2, { 2.554688, 1.000000, 1.527344, 0 } }, + { "OLYMPUS", "C8080WZ", "5000K Neutral fluorescent lamp", 3, { 2.804688, 1.000000, 1.421875, 0 } }, + { "OLYMPUS", "C8080WZ", "5000K Neutral fluorescent lamp", 4, { 3.050781, 1.000000, 1.320312, 0 } }, + { "OLYMPUS", "C8080WZ", "5000K Neutral fluorescent lamp", 5, { 3.296875, 1.000000, 1.214844, 0 } }, + { "OLYMPUS", "C8080WZ", "5000K Neutral fluorescent lamp", 6, { 3.546875, 1.000000, 1.109375, 0 } }, + { "OLYMPUS", "C8080WZ", "5000K Neutral fluorescent lamp", 7, { 3.792969, 1.000000, 1.007812, 0 } }, + { "OLYMPUS", "C8080WZ", "4200K Cool white fluorescent lamp", -7, { 1.109375, 1.000000, 3.257812, 0 } }, + { "OLYMPUS", "C8080WZ", "4200K Cool white fluorescent lamp", -6, { 1.226562, 1.000000, 3.105469, 0 } }, + { "OLYMPUS", "C8080WZ", "4200K Cool white fluorescent lamp", -5, { 1.339844, 1.000000, 2.953125, 0 } }, + { "OLYMPUS", "C8080WZ", "4200K Cool white fluorescent lamp", -4, { 1.457031, 1.000000, 2.796875, 0 } }, + { "OLYMPUS", "C8080WZ", "4200K Cool white fluorescent lamp", -3, { 1.570312, 1.000000, 2.644531, 0 } }, + { "OLYMPUS", "C8080WZ", "4200K Cool white fluorescent lamp", -2, { 1.687500, 1.000000, 2.492188, 0 } }, + { "OLYMPUS", "C8080WZ", "4200K Cool white fluorescent lamp", -1, { 1.800781, 1.000000, 2.339844, 0 } }, + { "OLYMPUS", "C8080WZ", "4200K Cool white fluorescent lamp", 0, { 1.917969, 1.000000, 2.187500, 0 } }, + { "OLYMPUS", "C8080WZ", "4200K Cool white fluorescent lamp", 1, { 2.144531, 1.000000, 2.054688, 0 } }, + { "OLYMPUS", "C8080WZ", "4200K Cool white fluorescent lamp", 2, { 2.375000, 1.000000, 1.921875, 0 } }, + { "OLYMPUS", "C8080WZ", "4200K Cool white fluorescent lamp", 3, { 2.605469, 1.000000, 1.792969, 0 } }, + { "OLYMPUS", "C8080WZ", "4200K Cool white fluorescent lamp", 4, { 2.835938, 1.000000, 1.660156, 0 } }, + { "OLYMPUS", "C8080WZ", "4200K Cool white fluorescent lamp", 5, { 3.066406, 1.000000, 1.531250, 0 } }, + { "OLYMPUS", "C8080WZ", "4200K Cool white fluorescent lamp", 6, { 3.296875, 1.000000, 1.398438, 0 } }, + { "OLYMPUS", "C8080WZ", "4200K Cool white fluorescent lamp", 7, { 3.527344, 1.000000, 1.265625, 0 } }, + { "OLYMPUS", "C8080WZ", "3500K White fluorescent lamp", -7, { 1.000000, 1.347368, 5.963158, 0 } }, + { "OLYMPUS", "C8080WZ", "3500K White fluorescent lamp", -6, { 1.000000, 1.224880, 5.167464, 0 } }, + { "OLYMPUS", "C8080WZ", "3500K White fluorescent lamp", -5, { 1.000000, 1.117904, 4.484716, 0 } }, + { "OLYMPUS", "C8080WZ", "3500K White fluorescent lamp", -4, { 1.000000, 1.028112, 3.911647, 0 } }, + { "OLYMPUS", "C8080WZ", "3500K White fluorescent lamp", -3, { 1.046875, 1.000000, 3.593750, 0 } }, + { "OLYMPUS", "C8080WZ", "3500K White fluorescent lamp", -2, { 1.125000, 1.000000, 3.386719, 0 } }, + { "OLYMPUS", "C8080WZ", "3500K White fluorescent lamp", -1, { 1.203125, 1.000000, 3.179688, 0 } }, + { "OLYMPUS", "C8080WZ", "3500K White fluorescent lamp", 0, { 1.281250, 1.000000, 2.972656, 0 } }, + { "OLYMPUS", "C8080WZ", "3500K White fluorescent lamp", 1, { 1.433594, 1.000000, 2.792969, 0 } }, + { "OLYMPUS", "C8080WZ", "3500K White fluorescent lamp", 2, { 1.585938, 1.000000, 2.613281, 0 } }, + { "OLYMPUS", "C8080WZ", "3500K White fluorescent lamp", 3, { 1.742188, 1.000000, 2.437500, 0 } }, + { "OLYMPUS", "C8080WZ", "3500K White fluorescent lamp", 4, { 1.894531, 1.000000, 2.257812, 0 } }, + { "OLYMPUS", "C8080WZ", "3500K White fluorescent lamp", 5, { 2.046875, 1.000000, 2.078125, 0 } }, + { "OLYMPUS", "C8080WZ", "3500K White fluorescent lamp", 6, { 2.203125, 1.000000, 1.902344, 0 } }, + { "OLYMPUS", "C8080WZ", "3500K White fluorescent lamp", 7, { 2.355469, 1.000000, 1.722656, 0 } }, + { "OLYMPUS", "C8080WZ", "3000K Tungsten", -7, { 1.000000, 1.488372, 6.988372, 0 } }, + { "OLYMPUS", "C8080WZ", "3000K Tungsten", -6, { 1.000000, 1.347368, 6.026316, 0 } }, + { "OLYMPUS", "C8080WZ", "3000K Tungsten", -5, { 1.000000, 1.230769, 5.235577, 0 } }, + { "OLYMPUS", "C8080WZ", "3000K Tungsten", -4, { 1.000000, 1.132743, 4.566372, 0 } }, + { "OLYMPUS", "C8080WZ", "3000K Tungsten", -3, { 1.000000, 1.049180, 4.000000, 0 } }, + { "OLYMPUS", "C8080WZ", "3000K Tungsten", -2, { 1.023438, 1.000000, 3.589844, 0 } }, + { "OLYMPUS", "C8080WZ", "3000K Tungsten", -1, { 1.093750, 1.000000, 3.371094, 0 } }, + { "OLYMPUS", "C8080WZ", "3000K Tungsten", 0, { 1.164062, 1.000000, 3.152344, 0 } }, + { "OLYMPUS", "C8080WZ", "3000K Tungsten", 1, { 1.300781, 1.000000, 2.960938, 0 } }, + { "OLYMPUS", "C8080WZ", "3000K Tungsten", 2, { 1.441406, 1.000000, 2.773438, 0 } }, + { "OLYMPUS", "C8080WZ", "3000K Tungsten", 3, { 1.582031, 1.000000, 2.582031, 0 } }, + { "OLYMPUS", "C8080WZ", "3000K Tungsten", 4, { 1.722656, 1.000000, 2.394531, 0 } }, + { "OLYMPUS", "C8080WZ", "3000K Tungsten", 5, { 1.722656, 1.000000, 2.394531, 0 } }, + { "OLYMPUS", "C8080WZ", "3000K Tungsten", 6, { 2.000000, 1.000000, 2.015625, 0 } }, + { "OLYMPUS", "C8080WZ", "3000K Tungsten", 7, { 2.140625, 1.000000, 1.828125, 0 } }, +// Fin ajout + { "OLYMPUS", "E-1", "3000K Tungsten", -7, { 1.015625, 1, 1.867188, 0 } }, { "OLYMPUS", "E-1", "3000K Tungsten", -6, { 1.007812, 1, 1.875000, 0 } }, { "OLYMPUS", "E-1", "3000K Tungsten", -5, { 1, 1, 1.890625, 0 } }, ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...