4 files changed, 16 insertions, 16 deletions

diff --git a/src/signalProcessing/conv/cconva.c b/src/signalProcessing/conv/cconva.c
index 99f0b1de..6debe139 100644
--- a/src/signalProcessing/conv/cconva.c
+++ b/src/signalProcessing/conv/cconva.c
@@ -17,16 +17,16 @@ void cconva(floatComplex *in1, int size1, floatComplex *in2,int size2, floatComp
 	floatComplex *in1b, *in2b, *result;	
 
 
-	m1=(int)floor(log(size1+size2-1)/log(2)+1);
-	m1=(int)pow(2,m1);
+	m1=(int)floor( log(float(size1+size2-1)) / log((float)2) + 1 );
+	m1=(int)pow((float)2,(float)m1);
 
-	in1b=malloc((unsigned int)(2*m1)*sizeof(float));
+	in1b=(floatComplex *)malloc((unsigned int)(2*m1)*sizeof(float));
 	for(i=0;i<m1;i++){
 		if (i<size1) in1b[i]=in1[i];
 		else in1b[i]=FloatComplex(0,0);
 	}
 	
-	in2b=malloc((unsigned int)(2*m1)*sizeof(float));
+	in2b=(floatComplex *)malloc((unsigned int)(2*m1)*sizeof(float));
 	for(i=0;i<m1;i++){
 		if (i<size2) in2b[i]=in2[i];
 		else in2b[i]=FloatComplex(0,0);
@@ -37,7 +37,7 @@ void cconva(floatComplex *in1, int size1, floatComplex *in2,int size2, floatComp
 	cfftma(in1b,m1,1,in1b);	
 
 	cfftma(in2b,m1,1,in2b);
-	result=malloc((unsigned int)(2*m1)*sizeof(float));
+	result=(floatComplex *)malloc((unsigned int)(2*m1)*sizeof(float));
 	cmula(in1b,in2b,m1,result);
 	cifftma(result,m1,1,result);
 
diff --git a/src/signalProcessing/conv/dconva.c b/src/signalProcessing/conv/dconva.c
index dc4294d0..975a5b19 100644
--- a/src/signalProcessing/conv/dconva.c
+++ b/src/signalProcessing/conv/dconva.c
@@ -17,15 +17,15 @@ void dconva(double *in1, int size1, double *in2,int size2, double *out){
 	int i;
 	doubleComplex *in1Cpx, *in2Cpx, *result;
 
-	in1Cpx=malloc(2*(unsigned int)size1*sizeof(double));	
-	in2Cpx=malloc(2*(unsigned int)size2*sizeof(double));	
+	in1Cpx=(doubleComplex*)malloc(2*(unsigned int)size1*sizeof(double));	
+	in2Cpx=(doubleComplex*)malloc(2*(unsigned int)size2*sizeof(double));	
 	for (i=0;i<size1;i++){
 	in1Cpx[i]=DoubleComplex(in1[i],0);
 	}
 	for (i=0;i<size2;i++){
 	in2Cpx[i]=DoubleComplex(in2[i],0);
 	}
-	result=malloc(2*(unsigned int)(size1+size2-1)*sizeof(double));
+	result=(doubleComplex*)malloc(2*(unsigned int)(size1+size2-1)*sizeof(double));
 
 	zconva(in1Cpx,size1,in2Cpx,size2,result);
 	zreala(result,size1+size2-1,out);
diff --git a/src/signalProcessing/conv/sconva.c b/src/signalProcessing/conv/sconva.c
index 09288381..0c1ee5a4 100644
--- a/src/signalProcessing/conv/sconva.c
+++ b/src/signalProcessing/conv/sconva.c
@@ -18,8 +18,8 @@ void sconva(float *in1, int size1, float *in2,int size2, float *out){
 	int i;
 	floatComplex *in1Cpx, *in2Cpx, *result;
 	
-	in1Cpx=malloc(2*(unsigned int)size1*sizeof(float));	
-	in2Cpx=malloc(2*(unsigned int)size2*sizeof(float));
+	in1Cpx=(floatComplex *)malloc(2*(unsigned int)size1*sizeof(float));	
+	in2Cpx=(floatComplex *)malloc(2*(unsigned int)size2*sizeof(float));
 	
 	for (i=0;i<size1;i++){
 	in1Cpx[i]=FloatComplex(in1[i],0);
@@ -29,7 +29,7 @@ void sconva(float *in1, int size1, float *in2,int size2, float *out){
 	in2Cpx[i]=FloatComplex(in2[i],0);
 	}
 
-	result=malloc(2*(unsigned int)(size1+size2-1)*sizeof(float));	
+	result=(floatComplex *)malloc(2*(unsigned int)(size1+size2-1)*sizeof(float));	
 
 	cconva(in1Cpx,size1,in2Cpx,size2,result);
 
diff --git a/src/signalProcessing/conv/zconva.c b/src/signalProcessing/conv/zconva.c
index 83c791ec..650a0491 100644
--- a/src/signalProcessing/conv/zconva.c
+++ b/src/signalProcessing/conv/zconva.c
@@ -18,16 +18,16 @@ void zconva(doubleComplex *in1, int size1, doubleComplex *in2,int size2, doubleC
 	doubleComplex *in1b, *in2b, *result;	
 
 
-	m1=(int)floor(log(size1+size2-1)/log(2)+1);
-	m1=(int)pow(2,m1);
+	m1=(int)floor(log((double)(size1+size2-1))/log(double(2))+1);
+	m1=(int)pow((double)(2),double(m1));
 
-	in1b=malloc(2*(unsigned int)m1*sizeof(double));
+	in1b=(doubleComplex *)malloc(2*(unsigned int)m1*sizeof(double));
 	for(i=0;i<m1;i++){
 		if (i<size1) in1b[i]=in1[i];
 		else in1b[i]=DoubleComplex(0,0);
 	}
 	
-	in2b=malloc(2*(unsigned int)m1*sizeof(double));
+	in2b=(doubleComplex *)malloc(2*(unsigned int)m1*sizeof(double));
 	for(i=0;i<m1;i++){
 		if (i<size2) in2b[i]=in2[i];
 		else in2b[i]=DoubleComplex(0,0);
@@ -37,7 +37,7 @@ void zconva(doubleComplex *in1, int size1, doubleComplex *in2,int size2, doubleC
 	zfftma(in1b,m1,1,in1b);
 	zfftma(in2b,m1,1,in2b);
 
-	result=malloc(2*(unsigned int)m1*sizeof(double));
+	result=(doubleComplex *)malloc(2*(unsigned int)m1*sizeof(double));
 	zmula(in1b,in2b,m1,result);
 	zifftma(result,m1,1,result);