From: Douglas W. <dwi...@us...> - 2006-03-03 00:01:09
|
Update of /cvsroot/hugin/hugin/src/include/common In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16112/src/include/common Modified Files: Tag: vigra140-branch math.h Log Message: comment out duplicate function Index: math.h =================================================================== RCS file: /cvsroot/hugin/hugin/src/include/common/math.h,v retrieving revision 1.14 retrieving revision 1.14.2.1 diff -u -d -r1.14 -r1.14.2.1 --- math.h 5 Feb 2006 15:04:25 -0000 1.14 +++ math.h 3 Mar 2006 00:00:56 -0000 1.14.2.1 @@ -107,7 +107,6 @@ double x,y; }; - /** clip a point to fit int [min, max] * does not do a mathematical clipping, just sets p.x and p.y * to the borders if they are outside. @@ -208,12 +207,15 @@ (int)(ceil(d.y * scale))); } +#if 0 +/// FIXME - DGSW duplicates function in diff2d.hxx /// uses ceil for rounding. -> might extend the image size. inline vigra::Size2D operator*(const vigra::Size2D & d, double scale) { return vigra::Size2D((int)(ceil(d.x * scale)), (int)(ceil(d.y * scale))); } +#endif /// uses floor for left and top and ceil for right and bottom -> extend image when rounding.. inline vigra::Rect2D operator*(const vigra::Rect2D & r, double scale) |