[Scipy-svn] r4312 - in branches/refactor_fft/scipy/fftpack/src: . fftw3

[scipy-svn at scipy.org]

Author: cdavid
Date: 2008-05-13 03:42:02 -0500 (Tue, 13 May 2008)
New Revision: 4312

Modified:
   branches/refactor_fft/scipy/fftpack/src/convolve.cxx
   branches/refactor_fft/scipy/fftpack/src/fftw3/api.h
Log:
Do not include cxx files anymore in convolve module source.

Modified: branches/refactor_fft/scipy/fftpack/src/convolve.cxx
===================================================================
--- branches/refactor_fft/scipy/fftpack/src/convolve.cxx	2008-05-13 08:41:13 UTC (rev 4311)
+++ branches/refactor_fft/scipy/fftpack/src/convolve.cxx	2008-05-13 08:42:02 UTC (rev 4312)
@@ -32,56 +32,18 @@
 
 /**************** FFTW *****************************/
 #ifdef WITH_FFTW
-#include "fftw/convolve.cxx"
 
+#include "fftw/api.h"
 #ifndef WITH_DJBFFT
-extern "C" void destroy_convolve_cache(void) 
-{
-}
-
-extern "C" void convolve(int n,double* inout,double* omega,int swap_real_imag) 
-{
-	convolve_fftw(n, inout, omega, swap_real_imag); 
-}
-
-extern "C" void convolve_z(int n,double* inout,double* omega_real,double* omega_imag) 
-{
-	convolve_z_fftw(n, inout, omega_real, omega_imag);
-}
-
-extern "C" void init_convolution_kernel(int n,double* omega, int d,
-			     double (*kernel_func)(int),
-			     int zero_nyquist) 
-{
-	init_convolution_kernel_fftw(n, omega, d, kernel_func, zero_nyquist);
-}
+        GEN_CONVOLVE_API(fftw)
 #endif
 
 #else
 /**************** FFTPACK ZFFT **********************/
-#include "fftpack/convolve.cxx"
+#include "fftpack/api.h"
 
 #ifndef WITH_DJBFFT
-extern "C" void destroy_convolve_cache(void) 
-{
-}
-
-extern "C" void convolve(int n,double* inout,double* omega,int swap_real_imag) 
-{
-	convolve_fftpack(n, inout, omega, swap_real_imag); 
-}
-
-extern "C" void convolve_z(int n,double* inout,double* omega_real,double* omega_imag) 
-{
-	convolve_z_fftpack(n, inout, omega_real, omega_imag);
-}
-
-extern "C" void init_convolution_kernel(int n,double* omega, int d,
-			     double (*kernel_func)(int),
-			     int zero_nyquist) 
-{
-	init_convolution_kernel_fftpack(n, omega, d, kernel_func, zero_nyquist);
-}
+        GEN_CONVOLVE_API(fftpack)
 #endif
 
 #endif

Modified: branches/refactor_fft/scipy/fftpack/src/fftw3/api.h
===================================================================
--- branches/refactor_fft/scipy/fftpack/src/fftw3/api.h	2008-05-13 08:41:13 UTC (rev 4311)
+++ branches/refactor_fft/scipy/fftpack/src/fftw3/api.h	2008-05-13 08:42:02 UTC (rev 4312)
@@ -3,6 +3,9 @@
 
 #include "fftpack.h"
 
+/*
+ * straight FFT api
+ */
 void drfft_fftw3(double * inout, int n, int direction, int howmany, 
                   int normalize);