Update of /cvsroot/ufraw/ufraw
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv6070
Modified Files:
ufraw_ufraw.c
Log Message:
Fix auto-crop calculation.
Index: ufraw_ufraw.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_ufraw.c,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -d -r1.239 -r1.240
--- ufraw_ufraw.c 13 Feb 2010 00:15:08 -0000 1.239
+++ ufraw_ufraw.c 13 Feb 2010 07:22:13 -0000 1.240
@@ -1511,6 +1511,10 @@
// Do not allow increasing canvas size by more than a factor of 2
uf->rotatedWidth = MIN(ceil(2*maxX)*scale, 2*iWidth);
uf->rotatedHeight = MIN(ceil(2*maxY)*scale, 2*iHeight);
+ if (minX/minY > aspectRatio)
+ minX = minY * aspectRatio;
+ else
+ minY = minX / aspectRatio;
uf->autoCropWidth = MIN(floor(2*minX)*scale, 2*iWidth);
uf->autoCropHeight = MIN(floor(2*minY)*scale, 2*iHeight);
int newWidth = uf->rotatedWidth * width / iWidth;
------------------------------------------------------------------------------
SOLARIS 10 is the OS for Data Centers - provides features such as DTrace,
Predictive Self Healing and Award Winning ZFS. Get Solaris 10 NOW
http://p.sf.net/sfu/solaris-dev2dev
_______________________________________________
ufraw-cvs mailing list
ufraw-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs
