diff options
author | torset | 2009-02-20 13:51:11 +0000 |
---|---|---|
committer | torset | 2009-02-20 13:51:11 +0000 |
commit | 2e2f500f9a66fa5fe57fdc24866e536f3a33ac81 (patch) | |
tree | bcd405b2a4ffd323a18ff67e7e3bfc778aa8bdf7 /src/signalProcessing/includes | |
parent | 524787f51548bdcee57faf1b02e15f6b7f05fce5 (diff) | |
download | scilab2c-2e2f500f9a66fa5fe57fdc24866e536f3a33ac81.tar.gz scilab2c-2e2f500f9a66fa5fe57fdc24866e536f3a33ac81.tar.bz2 scilab2c-2e2f500f9a66fa5fe57fdc24866e536f3a33ac81.zip |
Change prototypes : real functions return real
Diffstat (limited to 'src/signalProcessing/includes')
-rw-r--r-- | src/signalProcessing/includes/fft.h | 5 | ||||
-rw-r--r-- | src/signalProcessing/includes/hilbert.h | 7 | ||||
-rw-r--r-- | src/signalProcessing/includes/ifft.h | 14 |
3 files changed, 14 insertions, 12 deletions
diff --git a/src/signalProcessing/includes/fft.h b/src/signalProcessing/includes/fft.h index 593c6eb3..79301325 100644 --- a/src/signalProcessing/includes/fft.h +++ b/src/signalProcessing/includes/fft.h @@ -22,8 +22,9 @@ #define cffts(in) in #define zffts(in) in -#define sfftma(in,rows,columns,out) cfftma(FloatComplexMatrix(in,0),rows,columns,out) -#define dfftma(in,rows,columns,out) zfftma(DoubleComplexMatrix(in,0),rows,columns,out) +void sfftma(float* in,int rows,int columns,float* out); + +void dfftma(double* in,int rows,int columns,double* out); /* ** compute the fast fourier transform of a vector diff --git a/src/signalProcessing/includes/hilbert.h b/src/signalProcessing/includes/hilbert.h index 18cdde46..b011dab0 100644 --- a/src/signalProcessing/includes/hilbert.h +++ b/src/signalProcessing/includes/hilbert.h @@ -17,6 +17,13 @@ #include "floatComplex.h" #include "doubleComplex.h" + +/* FIXME : input : real + output : complex + Is this true all time? + Or must we do input : real, output :real? +*/ + float shilberts(float in); void shilberta (float* in, int rows, int cols, floatComplex *out); diff --git a/src/signalProcessing/includes/ifft.h b/src/signalProcessing/includes/ifft.h index a0c06ef4..877ea88e 100644 --- a/src/signalProcessing/includes/ifft.h +++ b/src/signalProcessing/includes/ifft.h @@ -21,16 +21,10 @@ #define ciffts(in) in #define ziffts(in) in -#define sifftma(in,rows,columns,out) {float* temp;\ - temp=malloc((uint)(rows*columns)*sizeof(float));\ - sfilla(temp,rows,columns,0);\ - cifftma(FloatComplexMatrix(in,temp,rows*columns),rows,columns,out);\ - } -#define difftma(in,rows,columns,out) {double* temp;\ - temp=malloc((uint)(rows*columns)*sizeof(double));\ - dfilla(temp,rows,columns,0);\ - zifftma(DoubleComplexMatrix(in,temp,rows*columns),rows,columns,out);\ - } + +void sifftma ( float* in , int rows, int cols, float* out); + +void difftma ( double* in , int rows, int cols, double* out); /* ** compute the inverse fast fourier transform of a vector |