[UFRaw-CVS] ufraw ufraw_ufraw.c,1.155,1.156

[Udi F. <udi...@us...>]

Update of /cvsroot/ufraw/ufraw
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv2304

Modified Files:
	ufraw_ufraw.c 
Log Message:
Re-enable shrink sizes between 1 and 2.


Index: ufraw_ufraw.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_ufraw.c,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -d -r1.155 -r1.156
--- ufraw_ufraw.c	28 Jul 2008 20:50:16 -0000	1.155
+++ ufraw_ufraw.c	11 Sep 2008 00:06:24 -0000	1.156
@@ -696,7 +696,7 @@
     if ( uf->conf->interpolation==half_interpolation ||
 	 ( uf->conf->size==0 && uf->conf->shrink>1 ) ||
 	 ( uf->conf->size>0 &&
-	   uf->conf->size<=MAX(uf->initialHeight, uf->initialWidth) ) ||
+	   uf->conf->size<=MAX(raw->raw.height, raw->raw.width) ) ||
 	 !uf->HaveFilters ) {
 	if (uf->conf->size==0 && uf->conf->shrink>1 &&
 		(int)(uf->conf->shrink*raw->pixel_aspect)%2==0)