Mercurial > octave
diff liboctave/array/fNDArray.cc @ 23058:5839d16828cb
move fftw classes inside octave namespace
* oct-fftw.h, oct-fftw.cc (fftw_planner, fftw_float_planner, fftw):
Move inside octave namespace and rename without octave_ prefix.
Change all uses.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Tue, 17 Jan 2017 11:42:25 -0500 |
| parents | 3a2b891d0b33 |
| children | ef4d915df748 |
line wrap: on
line diff
--- a/liboctave/array/fNDArray.cc Tue Jan 17 11:19:44 2017 -0500 +++ b/liboctave/array/fNDArray.cc Tue Jan 17 11:42:25 2017 -0500 @@ -79,8 +79,8 @@ // Need to be careful here about the distance between fft's for (octave_idx_type k = 0; k < nloop; k++) - octave_fftw::fft (in + k * stride * n, out + k * stride * n, - n, howmany, stride, dist); + octave::fftw::fft (in + k * stride * n, out + k * stride * n, + n, howmany, stride, dist); return retval; } @@ -109,8 +109,8 @@ // Need to be careful here about the distance between fft's for (octave_idx_type k = 0; k < nloop; k++) - octave_fftw::ifft (out + k * stride * n, out + k * stride * n, - n, howmany, stride, dist); + octave::fftw::ifft (out + k * stride * n, out + k * stride * n, + n, howmany, stride, dist); return retval; } @@ -130,7 +130,7 @@ octave_idx_type dist = dv(0) * dv(1); for (octave_idx_type i=0; i < howmany; i++) - octave_fftw::fftNd (in + i*dist, out + i*dist, 2, dv2); + octave::fftw::fftNd (in + i*dist, out + i*dist, 2, dv2); return retval; } @@ -149,7 +149,7 @@ octave_idx_type dist = dv(0) * dv(1); for (octave_idx_type i=0; i < howmany; i++) - octave_fftw::ifftNd (out + i*dist, out + i*dist, 2, dv2); + octave::fftw::ifftNd (out + i*dist, out + i*dist, 2, dv2); return retval; } @@ -164,7 +164,7 @@ FloatComplexNDArray retval (dv); FloatComplex *out (retval.fortran_vec ()); - octave_fftw::fftNd (in, out, rank, dv); + octave::fftw::fftNd (in, out, rank, dv); return retval; } @@ -180,7 +180,7 @@ FloatComplexNDArray retval (dv); FloatComplex *out (retval.fortran_vec ()); - octave_fftw::ifftNd (in, out, rank, dv); + octave::fftw::ifftNd (in, out, rank, dv); return retval; }