[Scipy-svn] r4885 - branches/remove_fft_backends/scipy/fftpack/src

scipy-svn@scip... scipy-svn@scip...
Sat Nov 1 09:07:03 CDT 2008


Author: cdavid
Date: 2008-11-01 09:06:57 -0500 (Sat, 01 Nov 2008)
New Revision: 4885

Modified:
   branches/remove_fft_backends/scipy/fftpack/src/fftpack.h
Log:
Remove unused convertion code for djbfft and fftw backends.

Modified: branches/remove_fft_backends/scipy/fftpack/src/fftpack.h
===================================================================
--- branches/remove_fft_backends/scipy/fftpack/src/fftpack.h	2008-11-01 14:04:16 UTC (rev 4884)
+++ branches/remove_fft_backends/scipy/fftpack/src/fftpack.h	2008-11-01 14:06:57 UTC (rev 4885)
@@ -82,100 +82,4 @@
   nof_in_cache_##name = last_cache_id_##name = 0;\
 }
 
-#define	COPYSTD2DJB(SRC,DEST,N) { \
-  int n2 = (N)/2,k,j; \
-  *(DEST) = *(SRC); \
-  *(DEST+1) = *(SRC+n2); \
-  for (j=(N)/2-1,k=2;j>0;--j,k+=2) { \
-    *(DEST+k) = *(SRC+n2+j); \
-    *(DEST+k+1) = *(SRC+j); \
-  } \
-}
-
-#define	COPYINVDJB2STD(SRC,DEST,N) { \
-  int n2 = (N)/2,k,j; \
-  *(DEST) = *(SRC); \
-  *(DEST+n2) = *(SRC+1); \
-  for (j=(N)/2-1,k=2;j>0;--j,k+=2) { \
-    *(DEST+n2+j) = *(SRC+k); \
-    *(DEST+j) = *(SRC+k+1); \
-  } \
-}
-
-#define	COPYINVDJB2STD2(SRC,DEST,N) { \
-  int n2 = (N)/2,k,j; \
-  *(DEST) = *(SRC); \
-  *(DEST+(N)-1) = *(SRC+(N)-1); \
-  for (j=1,k=1;j<n2;++j,k+=2) { \
-    *(DEST+n2+j-1) = *(SRC+k); \
-    *(DEST+j) = *(SRC+k+1); \
-  } \
-}
-
-#define COPYDJB2STD(SRC,DEST,FRQ,N) { \
-  int n2 = (N)/2,k,j; \
-  *(DEST) = *(SRC); \
-  *(DEST+N-1) = *(SRC+1); \
-  for (k=2;k<N-1;k+=2) { \
-    j = FRQ[k]; \
-    if (j>n2) { \
-      j = 2*(N-j); \
-      *(DEST+j-1) = *(SRC+k); \
-      *(DEST+j) = -*(SRC+k+1); \
-    } else { \
-      j *= 2; \
-      *(DEST+j-1) = *(SRC+k); \
-      *(DEST+j) = *(SRC+k+1); \
-    } \
-  } \
-}
-#define COPYINVSTD2DJB(SRC,DEST,NORMALIZE,FRQ,N) { \
-  int n2 = (N)/2,k,j; \
-  if (NORMALIZE) { \
-    *(DEST) = *(SRC); \
-    *(DEST+1) = *(SRC+N-1); \
-  } else { \
-    *(DEST) = (*(SRC))*0.5; \
-    *(DEST+1) = (*(SRC+N-1))*0.5; \
-  } \
-  for (k=2;k<N-1;k+=2) { \
-    j = FRQ[k]; \
-    if (j>n2) { \
-      j = 2*(N-j); \
-      *(DEST+k) = *(SRC+j-1); \
-      *(DEST+k+1) = -*(SRC+j); \
-    } else { \
-      j *= 2; \
-      *(DEST+k) = *(SRC+j-1); \
-      *(DEST+k+1) = *(SRC+j); \
-    } \
-  } \
-}
-#define COPYRFFTW2STD(SRC,DEST,N) { \
-  int j,n2=(N)/2; \
-  *(DEST) = *(SRC); \
-  for (j=1;j<n2;++j) { \
-    *(DEST+2*j-1) = *(SRC+j); \
-    *(DEST+2*j) = *(SRC+(N)-j); \
-  } \
-  if (N>1) { \
-    *(DEST+2*n2-1) = *(SRC+n2); \
-    if ((N)%2) \
-      *(DEST+2*n2) = *(SRC+(N)-n2); \
-  } \
-}
-#define COPYINVRFFTW2STD(SRC,DEST,N) { \
-  int j,n2=(N)/2; \
-  *(DEST) = *(SRC); \
-  for (j=1;j<n2;++j) { \
-    *(DEST+j) = *(SRC+2*j-1); \
-    *(DEST+(N)-j) = *(SRC+2*j); \
-  } \
-  if (N>1) {\
-    *(DEST+n2) = *(SRC+2*n2-1); \
-    if ((N)%2) \
-      *(DEST+(N)-n2) = *(SRC+2*n2); \
-  } \
-}
-
 #endif



More information about the Scipy-svn mailing list