From: Niels K. B. J. <nk...@us...> - 2007-05-28 09:38:08
|
Update of /cvsroot/ufraw/ufraw In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv32293 Modified Files: ufraw_ufraw.c Log Message: Really fix interpolation for Foveon (Sigma) cameras. Index: ufraw_ufraw.c =================================================================== RCS file: /cvsroot/ufraw/ufraw/ufraw_ufraw.c,v retrieving revision 1.94 retrieving revision 1.95 diff -u -d -r1.94 -r1.95 --- ufraw_ufraw.c 28 May 2007 06:40:38 -0000 1.94 +++ ufraw_ufraw.c 28 May 2007 09:38:05 -0000 1.95 @@ -662,7 +662,7 @@ * If pixel_aspect<1 (e.g. NIKON 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). */ - uf->ConvertShrink = uf->conf->shrink; + uf->ConvertShrink = 1; if ( uf->conf->interpolation==half_interpolation || ( uf->conf->size==0 && uf->conf->shrink>1 ) || ( uf->conf->size>0 && @@ -705,7 +705,7 @@ dcraw_data *raw = uf->raw; dcraw_image_data final; - if (uf->ConvertShrink>1) { + if (uf->ConvertShrink>1 || raw->filters==0) { dcraw_finalize_shrink(&final, raw, uf->ConvertShrink); uf->image.height = final.height; |