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

[Niels K. B. J. <nk...@us...>]

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

Modified Files:
	ufraw_ufraw.c 
Log Message:
Fix segfault with Sigma .X3F files.

Index: ufraw_ufraw.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_ufraw.c,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -d -r1.154 -r1.155
--- ufraw_ufraw.c	28 Jul 2008 18:20:24 -0000	1.154
+++ ufraw_ufraw.c	28 Jul 2008 20:50:16 -0000	1.155
@@ -592,6 +592,10 @@
 
     /* Foveon image dimensions are knows only after load_raw()*/
     ufraw_get_image_dimensions(raw, uf);
+    if (uf->conf->CropX2 > uf->rotatedWidth)
+	uf->conf->CropX2 = uf->rotatedWidth;
+    if (uf->conf->CropY2 > uf->rotatedHeight)
+	uf->conf->CropY2 = uf->rotatedHeight;
 
     /* chanMul[0]<0 signals that we need to recalculate the WB */
     if (uf->conf->chanMul[0]<0) ufraw_set_wb(uf);