[Scipy-svn] r3023 - trunk/Lib/fftpack/src

[scipy-svn@scip...]

Author: pearu
Date: 2007-05-21 09:15:05 -0500 (Mon, 21 May 2007)
New Revision: 3023

Modified:
   trunk/Lib/fftpack/src/zfft.c
   trunk/Lib/fftpack/src/zfft_mkl.c
Log:
Resolved previous typo fix differently.

Modified: trunk/Lib/fftpack/src/zfft.c
===================================================================
--- trunk/Lib/fftpack/src/zfft.c	2007-05-21 14:09:45 UTC (rev 3022)
+++ trunk/Lib/fftpack/src/zfft.c	2007-05-21 14:15:05 UTC (rev 3023)
@@ -48,7 +48,7 @@
 #elif defined WITH_MKL
     #include "zfft_mkl.c"
     #ifndef WITH_DJBFFT
-        GEN_PUBLIC_API(mklfft)
+        GEN_PUBLIC_API(mkl)
     #endif
 #else /* Use fftpack by default */
     #include "zfft_fftpack.c"

Modified: trunk/Lib/fftpack/src/zfft_mkl.c
===================================================================
--- trunk/Lib/fftpack/src/zfft_mkl.c	2007-05-21 14:09:45 UTC (rev 3022)
+++ trunk/Lib/fftpack/src/zfft_mkl.c	2007-05-21 14:15:05 UTC (rev 3023)
@@ -1,9 +1,9 @@
-GEN_CACHE(zmklfft,(int n)
+GEN_CACHE(zmkl,(int n)
 	  ,DFTI_DESCRIPTOR_HANDLE desc_handle;
-	  ,(caches_zmklfft[i].n==n)
-      ,DftiCreateDescriptor(&caches_zmklfft[id].desc_handle, DFTI_DOUBLE, DFTI_COMPLEX, 1, (long)n); 
-       DftiCommitDescriptor(caches_zmklfft[id].desc_handle);
-	  ,DftiFreeDescriptor(&caches_zmklfft[id].desc_handle);
+	  ,(caches_zmkl[i].n==n)
+      ,DftiCreateDescriptor(&caches_zmkl[id].desc_handle, DFTI_DOUBLE, DFTI_COMPLEX, 1, (long)n); 
+       DftiCommitDescriptor(caches_zmkl[id].desc_handle);
+	  ,DftiFreeDescriptor(&caches_zmkl[id].desc_handle);
 	  ,10)
 
 static void zfft_mkl(complex_double * inout,
@@ -12,7 +12,7 @@
 	int i;
 	complex_double *ptr = inout;
 	DFTI_DESCRIPTOR_HANDLE desc_handle;
-	desc_handle = caches_zmklfft[get_cache_id_zmklfft(n)].desc_handle;
+	desc_handle = caches_zmkl[get_cache_id_zmkl(n)].desc_handle;
 
 	switch (direction) {