[Octave-cvsupdate] octave-forge/main/image rotate_scale.cc,1.1,1.2

[andy a. <aa...@us...>]

Update of /cvsroot/octave/octave-forge/main/image
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8545/main/image

Modified Files:
	rotate_scale.cc 
Log Message:
Change layout to not confuse builtins.cc

Index: rotate_scale.cc
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/image/rotate_scale.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- rotate_scale.cc	3 Mar 2003 21:15:51 -0000	1.1
+++ rotate_scale.cc	22 Apr 2005 17:29:42 -0000	1.2
@@ -49,7 +49,8 @@
   "   example:\n"
   "  im0= zeros(100); im0(25:75,25:75)=1;\n"
   "  im1= rotate_scale( im0, [40,60;50,50],[60,90;60,90],[120,120]);\n"
-) {
+)
+{
    octave_value_list retval;
    if (args.length() < 4 ||
        !args(0).is_matrix_type() ||
@@ -93,10 +94,7 @@
    return retval;
 }
 
-#ifdef sqr
-#undef sqr
-#endif
-#define sqr(a) ((a)*(a))
+inline double sqr(double a) { return (a)*(a); }
 
 void
 calc_rotation_params(