From f906b4794683c21332a46409a95619010b2093ee Mon Sep 17 00:00:00 2001 From: Mark Borgerding Date: Tue, 12 Aug 2003 23:37:09 +0000 Subject: [PATCH] *** empty log message *** --- Makefile | 32 +++++++------------------------- kiss_fft.c | 2 +- 2 files changed, 8 insertions(+), 26 deletions(-) diff --git a/Makefile b/Makefile index 91acf21..04fac77 100644 --- a/Makefile +++ b/Makefile @@ -1,28 +1,10 @@ -SPEEDTESTFILE=/dev/shm/kissfft_speedtest -SPEEDTESTNSAMPS=1000 - -all: kiss_fft_s kiss_fft_f kiss_fft_d - -kiss_fft_s: kiss_fft.h kiss_fft.c - gcc -Wall -O3 -o kiss_fft_s -DFIXED_POINT -DFFT_UTIL kiss_fft.c -lm - -kiss_fft_f: kiss_fft.h kiss_fft.c - gcc -Wall -O3 -o kiss_fft_f -Dkiss_fft_scalar=float -DFFT_UTIL kiss_fft.c -lm - -kiss_fft_d: kiss_fft.h kiss_fft.c - gcc -Wall -O3 -o kiss_fft_d -Dkiss_fft_scalar=double -DFFT_UTIL kiss_fft.c -lm - -clean: - rm -f kiss_fft_s kiss_fft_f kiss_fft_d *~ fftin.dat fftout.dat $(SPEEDTESTFILE) - -test: all - ./test.oct - -speedf: kiss_fft_f $(SPEEDTESTFILE) - time ./kiss_fft_f < $(SPEEDTESTFILE) > /dev/null - -$(SPEEDTESTFILE): - dd if=/dev/zero bs=8192 count=$(SPEEDTESTNSAMPS) of=$(SPEEDTESTFILE) +message: + @echo "Nothing to make here. Move on down to sample_code for ... you guessed it! Sample Code!" tarball: clean tar -czf kiss_fft.tar.gz . + +clean: + cd sample_code && make clean + rm -f kiss_fft.tar.gz *~ + diff --git a/kiss_fft.c b/kiss_fft.c index 4eeb1b2..b63876d 100644 --- a/kiss_fft.c +++ b/kiss_fft.c @@ -180,7 +180,7 @@ void * kiss_fft_alloc(int nfft,int inverse_fft) { kiss_fft_state * st=NULL; // allocate one large buffer to hold the state, twiddle buffers, and bit-rev indices - int size = sizeof(kiss_fft_state) + (nfft>>1)*sizeof(kiss_fft_cpx) + (nfft>>1)*sizeof(int); + int size = sizeof(kiss_fft_state) + (nfft>>1)*sizeof(kiss_fft_cpx) + nfft*sizeof(int); st = ( kiss_fft_state *)malloc(size); if (st) {