Mercurial > octave

diff libinterp/corefcn/fft2.cc @ 25586:59f4fda5c548

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove fftpack sources We now require FFTW to perform FFT calculations. * liboctave/external/fftpack: Delete directory and all files. * liboctave/external/module.mk: Update. * lo-fftpack-proto.h: Delete. * liboctave/numeric/module.mk: Update. * CMatrix.cc, CNDArray.cc, dMatrix.cc, dNDArray.cc, fCMatrix.cc, fCNDArray.cc, fMatrix.cc, fNDArray.cc: Require FFTW to compute FFT. * interpft.m, fftconv.m, fftfilt.m, freqz.m, fft.cc, fft2.cc, fftn.cc: Use TESTIF HAVE_FFTW as needed. * NEWS: Note change.
author John W. Eaton <jwe@octave.org>
date Wed, 11 Jul 2018 17:41:36 -0400
parents 6652d3823428
children 00f796120a6d
line wrap: on
line diff
--- a/libinterp/corefcn/fft2.cc	Wed Jul 11 11:20:58 2018 -0700
+++ b/libinterp/corefcn/fft2.cc	Wed Jul 11 17:41:36 2018 -0400
@@ -35,12 +35,6 @@
 
 // This function should be merged with Fifft.
 
-#if defined (HAVE_FFTW)
-#  define FFTSRC "@sc{fftw}"
-#else
-#  define FFTSRC "@sc{fftpack}"
-#endif
-
 static octave_value
 do_fft2 (const octave_value_list& args, const char *fcn, int type)
 {
@@ -182,7 +176,7 @@
 ## Author: David Billinghurst (David.Billinghurst@riotinto.com.au)
 ##         Comalco Research and Technology
 ##         02 May 2000
-%!test
+%!testif HAVE_FFTW
 %! M = 16;
 %! N = 8;
 %!
@@ -201,7 +195,7 @@
 ## Author: David Billinghurst (David.Billinghurst@riotinto.com.au)
 ##         Comalco Research and Technology
 ##         02 May 2000
-%!test
+%!testif HAVE_FFTW
 %! M = 12;
 %! N = 7;
 %!
@@ -223,7 +217,7 @@
 ## Author: David Billinghurst (David.Billinghurst@riotinto.com.au)
 ##         Comalco Research and Technology
 ##         02 May 2000
-%!test
+%!testif HAVE_FFTW
 %! M = 16;
 %! N = 8;
 %!
@@ -242,7 +236,7 @@
 ## Author: David Billinghurst (David.Billinghurst@riotinto.com.au)
 ##         Comalco Research and Technology
 ##         02 May 2000
-%!test
+%!testif HAVE_FFTW
 %! M = 12;
 %! N = 7;
 %!