diff options
31 files changed, 40 insertions, 61 deletions
diff --git a/src/c/signalProcessing/crossCorr/ccrossCorra.c b/src/c/signalProcessing/crossCorr/ccrossCorra.c index 53656f60..e2c66412 100644 --- a/src/c/signalProcessing/crossCorr/ccrossCorra.c +++ b/src/c/signalProcessing/crossCorr/ccrossCorra.c @@ -11,7 +11,7 @@ * */ -#include <malloc.h> +#include <stdlib.h> #include "crossCorr.h" #include "conv2d.h" #include "conj.h" diff --git a/src/c/signalProcessing/crossCorr/dcrossCorra.c b/src/c/signalProcessing/crossCorr/dcrossCorra.c index 42287ca3..b02298fd 100644 --- a/src/c/signalProcessing/crossCorr/dcrossCorra.c +++ b/src/c/signalProcessing/crossCorr/dcrossCorra.c @@ -11,12 +11,10 @@ * */ -#include <malloc.h> +#include <stdlib.h> #include "crossCorr.h" #include "conv2d.h" - - void dcrossCorra(double* in1, int rows1, int cols1, double* in2, int rows2, int cols2, double* out){ double *in2Copy; int i; @@ -24,7 +22,10 @@ void dcrossCorra(double* in1, int rows1, int cols1, double* in2, int rows2, int in2Copy=(double*)malloc((unsigned int)(rows2*cols2)*sizeof(double)); /* We change in2 to be in appropriate form in in2Copy*/ - for (i=0;i<(rows2*cols2);i++) in2Copy[i]=in2[rows2*cols2-1-i]; + for (i=0;i<(rows2*cols2);i++) + { + in2Copy[i]=in2[rows2*cols2-1-i]; + } dconv2da(in1, rows1, cols1, in2Copy, rows2, cols2, out); diff --git a/src/c/signalProcessing/crossCorr/scrossCorra.c b/src/c/signalProcessing/crossCorr/scrossCorra.c index fd0ed507..ddc9df76 100644 --- a/src/c/signalProcessing/crossCorr/scrossCorra.c +++ b/src/c/signalProcessing/crossCorr/scrossCorra.c @@ -11,7 +11,7 @@ * */ -#include <malloc.h> +#include <stdlib.h> #include "crossCorr.h" #include "conv2d.h" diff --git a/src/c/signalProcessing/crossCorr/zcrossCorra.c b/src/c/signalProcessing/crossCorr/zcrossCorra.c index 4ff03f7b..f5659a36 100644 --- a/src/c/signalProcessing/crossCorr/zcrossCorra.c +++ b/src/c/signalProcessing/crossCorr/zcrossCorra.c @@ -11,7 +11,7 @@ * */ -#include <malloc.h> +#include <stdlib.h> #include "crossCorr.h" #include "conv2d.h" #include "conj.h" diff --git a/src/c/signalProcessing/fft/cfftma.c b/src/c/signalProcessing/fft/cfftma.c index 46768d93..6bd2f744 100644 --- a/src/c/signalProcessing/fft/cfftma.c +++ b/src/c/signalProcessing/fft/cfftma.c @@ -10,9 +10,7 @@ * */ - -#include <stdio.h> -#include <malloc.h> +#include <stdlib.h> #include "fft.h" void cfftma ( floatComplex* in , int rows, int cols, floatComplex* out) diff --git a/src/c/signalProcessing/fft/dfftma.c b/src/c/signalProcessing/fft/dfftma.c index bd8cc0be..cf584623 100644 --- a/src/c/signalProcessing/fft/dfftma.c +++ b/src/c/signalProcessing/fft/dfftma.c @@ -10,11 +10,10 @@ * */ -#include <malloc.h> +#include <stdlib.h> #include "fft.h" #include "zeros.h" - void dfftma ( double* in , int rows, int cols, double* out){ double* ZEROS; doubleComplex* inCpx; diff --git a/src/c/signalProcessing/fft/sfftma.c b/src/c/signalProcessing/fft/sfftma.c index b0878cfb..d4e145b5 100644 --- a/src/c/signalProcessing/fft/sfftma.c +++ b/src/c/signalProcessing/fft/sfftma.c @@ -10,11 +10,10 @@ * */ -#include <malloc.h> +#include <stdlib.h> #include "fft.h" #include "zeros.h" - void sfftma ( float* in , int rows, int cols, float* out){ float* ZEROS; floatComplex* inCpx; diff --git a/src/c/signalProcessing/fft/testMatFft.c b/src/c/signalProcessing/fft/testMatFft.c index 1d5c5565..88631622 100644 --- a/src/c/signalProcessing/fft/testMatFft.c +++ b/src/c/signalProcessing/fft/testMatFft.c @@ -10,7 +10,7 @@ * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt * */ -#include <malloc.h> +#include <stdlib.h> #include <assert.h> #include <stdio.h> #include <math.h> diff --git a/src/c/signalProcessing/fft/zfftma.c b/src/c/signalProcessing/fft/zfftma.c index 820ec6e6..48616eaf 100644 --- a/src/c/signalProcessing/fft/zfftma.c +++ b/src/c/signalProcessing/fft/zfftma.c @@ -12,14 +12,12 @@ #define FFT842 1 #define DFFT2 0 -#include <malloc.h> +#include <stdlib.h> #include <math.h> #include "fft.h" #include "lapack.h" #include "fft_internal.h" -#include <stdio.h> - void zfftma ( doubleComplex* in , int rows, int cols, doubleComplex* out) { diff --git a/src/c/signalProcessing/fftshift/cfftshifta.c b/src/c/signalProcessing/fftshift/cfftshifta.c index 19f400a0..9297ca3f 100644 --- a/src/c/signalProcessing/fftshift/cfftshifta.c +++ b/src/c/signalProcessing/fftshift/cfftshifta.c @@ -10,7 +10,7 @@ * */ -#include <malloc.h> +#include <stdlib.h> #include "fftshift.h" void cfftshifta(floatComplex* in,int rows,int columns,floatComplex* out){ diff --git a/src/c/signalProcessing/fftshift/dfftshifta.c b/src/c/signalProcessing/fftshift/dfftshifta.c index cbab193e..ffab173b 100644 --- a/src/c/signalProcessing/fftshift/dfftshifta.c +++ b/src/c/signalProcessing/fftshift/dfftshifta.c @@ -10,7 +10,7 @@ * */ -#include <malloc.h> +#include <stdlib.h> #include "fftshift.h" void dfftshifta(double* in,int rows,int columns,double* out){ diff --git a/src/c/signalProcessing/fftshift/sfftshifta.c b/src/c/signalProcessing/fftshift/sfftshifta.c index a5fa76b0..a53734ac 100644 --- a/src/c/signalProcessing/fftshift/sfftshifta.c +++ b/src/c/signalProcessing/fftshift/sfftshifta.c @@ -10,7 +10,7 @@ * */ -#include <malloc.h> +#include <stdlib.h> #include "fftshift.h" void sfftshifta(float* in,int rows,int columns,float* out){ diff --git a/src/c/signalProcessing/fftshift/zfftshifta.c b/src/c/signalProcessing/fftshift/zfftshifta.c index 2cabd8cc..6cf4e25b 100644 --- a/src/c/signalProcessing/fftshift/zfftshifta.c +++ b/src/c/signalProcessing/fftshift/zfftshifta.c @@ -10,7 +10,7 @@ * */ -#include <malloc.h> +#include <stdlib.h> #include "fftshift.h" void zfftshifta(doubleComplex* in,int rows,int columns,doubleComplex* out){ diff --git a/src/c/signalProcessing/ifft/cifftma.c b/src/c/signalProcessing/ifft/cifftma.c index 47bca867..209cdc92 100644 --- a/src/c/signalProcessing/ifft/cifftma.c +++ b/src/c/signalProcessing/ifft/cifftma.c @@ -10,9 +10,7 @@ * */ - -#include <malloc.h> -#include <stdio.h> +#include <stdlib.h> #include "ifft.h" void cifftma ( floatComplex* in , int rows, int cols, floatComplex* out) diff --git a/src/c/signalProcessing/ifft/difftma.c b/src/c/signalProcessing/ifft/difftma.c index 67981652..9b4bc6e3 100644 --- a/src/c/signalProcessing/ifft/difftma.c +++ b/src/c/signalProcessing/ifft/difftma.c @@ -10,7 +10,7 @@ * */ -#include <malloc.h> +#include <stdlib.h> #include "ifft.h" #include "zeros.h" diff --git a/src/c/signalProcessing/ifft/sifftma.c b/src/c/signalProcessing/ifft/sifftma.c index b44c6f9f..63661bae 100644 --- a/src/c/signalProcessing/ifft/sifftma.c +++ b/src/c/signalProcessing/ifft/sifftma.c @@ -10,11 +10,10 @@ * */ -#include <malloc.h> +#include <stdlib.h> #include "ifft.h" #include "zeros.h" - void sifftma ( float* in , int rows, int cols, float* out){ float* ZEROS; floatComplex* inCpx; diff --git a/src/c/signalProcessing/ifft/testMatIfft.c b/src/c/signalProcessing/ifft/testMatIfft.c index 64048a8d..6acb749f 100644 --- a/src/c/signalProcessing/ifft/testMatIfft.c +++ b/src/c/signalProcessing/ifft/testMatIfft.c @@ -10,7 +10,7 @@ * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt * */ -#include <malloc.h> +#include <stdlib.h> #include <assert.h> #include <stdio.h> #include <math.h> diff --git a/src/c/signalProcessing/ifft/zifftma.c b/src/c/signalProcessing/ifft/zifftma.c index 40a7e9ad..b5a00dd1 100644 --- a/src/c/signalProcessing/ifft/zifftma.c +++ b/src/c/signalProcessing/ifft/zifftma.c @@ -9,16 +9,16 @@ * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt * */ + #define IFFT842 1 #define DFFT2 0 -#include <malloc.h> +#include <stdlib.h> #include <math.h> #include "ifft.h" #include "lapack.h" #include "ifft_internal.h" - void zifftma ( doubleComplex* in , int rows, int cols, doubleComplex* out) { diff --git a/src/c/signalProcessing/includes/conv.h b/src/c/signalProcessing/includes/conv.h index c7fd1d5e..9dd43a50 100644 --- a/src/c/signalProcessing/includes/conv.h +++ b/src/c/signalProcessing/includes/conv.h @@ -14,7 +14,7 @@ #define __CONV_H__ #include <math.h> -#include <malloc.h> +#include <stdlib.h> #include "dynlib_signalprocessing.h" #include "floatComplex.h" #include "doubleComplex.h" diff --git a/src/c/signalProcessing/lev/cleva.c b/src/c/signalProcessing/lev/cleva.c index 96a36d12..5b04c335 100644 --- a/src/c/signalProcessing/lev/cleva.c +++ b/src/c/signalProcessing/lev/cleva.c @@ -26,7 +26,7 @@ rc :Reflection coefficients */ - +#include <stdlib.h> #include "lev.h" #include "malloc.h" #include "stdlib.h" diff --git a/src/c/signalProcessing/lev/cleva2.c b/src/c/signalProcessing/lev/cleva2.c index 190484a5..e98ab383 100644 --- a/src/c/signalProcessing/lev/cleva2.c +++ b/src/c/signalProcessing/lev/cleva2.c @@ -26,7 +26,7 @@ rc :Reflection coefficients */ - +#include <stdlib.h> #include "lev.h" #include "malloc.h" #include "stdlib.h" diff --git a/src/c/signalProcessing/lev/dleva.c b/src/c/signalProcessing/lev/dleva.c index 49f757c8..2565f60f 100644 --- a/src/c/signalProcessing/lev/dleva.c +++ b/src/c/signalProcessing/lev/dleva.c @@ -26,11 +26,8 @@ rc :Reflection coefficients */ - +#include <stdlib.h> #include "lev.h" -#include "malloc.h" -#include "stdlib.h" - double dleva(double* in,int size, double* ar, double* rc){ int i=0, j=0; diff --git a/src/c/signalProcessing/lev/dleva2.c b/src/c/signalProcessing/lev/dleva2.c index 8b2ab8ae..c75f9d50 100644 --- a/src/c/signalProcessing/lev/dleva2.c +++ b/src/c/signalProcessing/lev/dleva2.c @@ -26,11 +26,8 @@ rc :Reflection coefficients */ - +#include <stdlib.h> #include "lev.h" -#include "malloc.h" -#include "stdlib.h" - double dleva2(double* in,int size, double* ar){ int i=0, j=0; diff --git a/src/c/signalProcessing/lev/sleva.c b/src/c/signalProcessing/lev/sleva.c index c1d1ab2b..87c24660 100644 --- a/src/c/signalProcessing/lev/sleva.c +++ b/src/c/signalProcessing/lev/sleva.c @@ -26,11 +26,8 @@ rc :Reflection coefficients */ - +#include <stdlib.h> #include "lev.h" -#include "malloc.h" -#include "stdlib.h" - float sleva(float* in,int size, float* ar, float* rc){ int i=0, j=0; diff --git a/src/c/signalProcessing/lev/sleva2.c b/src/c/signalProcessing/lev/sleva2.c index 06d73405..44d7974b 100644 --- a/src/c/signalProcessing/lev/sleva2.c +++ b/src/c/signalProcessing/lev/sleva2.c @@ -26,11 +26,8 @@ rc :Reflection coefficients */ - +#include <stdlib.h> #include "lev.h" -#include "malloc.h" -#include "stdlib.h" - float sleva2(float* in,int size, float* ar){ int i=0, j=0; diff --git a/src/c/signalProcessing/lev/zleva.c b/src/c/signalProcessing/lev/zleva.c index 053e7b4a..c2b9b1b0 100644 --- a/src/c/signalProcessing/lev/zleva.c +++ b/src/c/signalProcessing/lev/zleva.c @@ -26,10 +26,8 @@ rc :Reflection coefficients */ - +#include <stdlib.h> #include "lev.h" -#include "malloc.h" -#include "stdlib.h" #include "conj.h" #include "multiplication.h" #include "addition.h" diff --git a/src/c/signalProcessing/lev/zleva2.c b/src/c/signalProcessing/lev/zleva2.c index 0f445ce2..049e7e0a 100644 --- a/src/c/signalProcessing/lev/zleva2.c +++ b/src/c/signalProcessing/lev/zleva2.c @@ -26,7 +26,7 @@ rc :Reflection coefficients */ - +#include <stdlib.h> #include "lev.h" #include "malloc.h" #include "stdlib.h" diff --git a/src/c/signalProcessing/levin/dlevina.c b/src/c/signalProcessing/levin/dlevina.c index 48388689..29ee6223 100644 --- a/src/c/signalProcessing/levin/dlevina.c +++ b/src/c/signalProcessing/levin/dlevina.c @@ -10,13 +10,12 @@ * */ +#include <stdlib.h> #include "levin.h" #include "levinUtils.h" #include "matrixInversion.h" #include "matrixMultiplication.h" #include "zeros.h" -#include <malloc.h> -#include <stdio.h> void dlevina (int n, double* cov, int lCov, int cCov, double* la, double* sig, double* lb){ /* diff --git a/src/c/signalProcessing/levin/slevina.c b/src/c/signalProcessing/levin/slevina.c index cafc21be..e0e30a84 100644 --- a/src/c/signalProcessing/levin/slevina.c +++ b/src/c/signalProcessing/levin/slevina.c @@ -10,13 +10,12 @@ * */ +#include <stdlib.h> #include "levin.h" #include "levinUtils.h" #include "matrixInversion.h" #include "matrixMultiplication.h" #include "zeros.h" -#include <malloc.h> -#include <stdio.h> void slevina (int n, float* cov, int lCov, int cCov, float* la, float* sig, float* lb){ /* diff --git a/src/c/signalProcessing/lpc2cep/dlpc2cepa.c b/src/c/signalProcessing/lpc2cep/dlpc2cepa.c index a9332b29..f79b258f 100644 --- a/src/c/signalProcessing/lpc2cep/dlpc2cepa.c +++ b/src/c/signalProcessing/lpc2cep/dlpc2cepa.c @@ -10,7 +10,7 @@ * */ -#include <malloc.h> +#include <stdlib.h> #include "lpc2cep.h" #include "fft.h" #include "logm.h" @@ -23,8 +23,9 @@ void dlpc2cepa(double* in, int size, double* out){ inCpx = (doubleComplex *) malloc ((unsigned int)(size*size)*sizeof(doubleComplex)); for (i=0;i<size*size;i++) + { inCpx[i]=DoubleComplex(in[i],0); - + } zfftma(inCpx,size, size, inCpx); zlogma(inCpx,size,inCpx); diff --git a/src/c/signalProcessing/lpc2cep/slpc2cepa.c b/src/c/signalProcessing/lpc2cep/slpc2cepa.c index 97236fc9..23857198 100644 --- a/src/c/signalProcessing/lpc2cep/slpc2cepa.c +++ b/src/c/signalProcessing/lpc2cep/slpc2cepa.c @@ -10,7 +10,7 @@ * */ -#include <malloc.h> +#include <stdlib.h> #include "lpc2cep.h" #include "fft.h" #include "ifft.h" @@ -23,7 +23,9 @@ void slpc2cepa(float *in, int size, float*out){ /* Copy in in a FloatComplex*/ inCpx=(floatComplex*)malloc((unsigned int)(size*size)*sizeof(floatComplex)); for (i=0;i<size*size;i++) + { inCpx[i]=FloatComplex(in[i],0); + } cfftma(inCpx,size,size,inCpx); clogma(inCpx,size,inCpx); |