diff src/DLD-FUNCTIONS/fft.cc @ 5275:23b37da9fd5b

[project @ 2005-04-08 16:07:35 by jwe]
author jwe
date Fri, 08 Apr 2005 16:07:37 +0000
parents b92d59213e63
children 4c8a2e4e0717
line wrap: on
line diff
--- a/src/DLD-FUNCTIONS/fft.cc	Thu Apr 07 21:51:37 2005 +0000
+++ b/src/DLD-FUNCTIONS/fft.cc	Fri Apr 08 16:07:37 2005 +0000
@@ -54,7 +54,7 @@
 
   octave_value arg = args(0);
   dim_vector dims = arg.dims ();
-  int n_points = -1;
+  octave_idx_type n_points = -1;
   int dim = -1;
   
   if (nargin > 1)
@@ -66,7 +66,7 @@
 	    error ("%s: NaN is invalid as the N_POINTS", fcn);
 	  else
 	    {
-	      n_points = NINT (dval);
+	      n_points = NINTbig (dval);
 	      if (n_points < 0)
 		error ("%s: number of points must be greater than zero", fcn);
 	    }
@@ -84,19 +84,20 @@
       else if (dval < 1 || dval > dims.length ())
 	error ("%s: invalid dimension along which to perform fft", fcn);
       else
+	// to be safe, cast it back to int since dim is an int
 	dim = NINT (dval) - 1;
     }
 
   if (error_state)
     return retval;
 
-  for (int i = 0; i < dims.length (); i++)
+  for (octave_idx_type i = 0; i < dims.length (); i++)
     if (dims(i) < 0)
       return retval;
 
   if (dim < 0)
     {
-      for (int i = 0; i < dims.length (); i++)
+      for (octave_idx_type i = 0; i < dims.length (); i++)
 	if ( dims(i) > 1)
 	  {
 	    dim = i;