diff options
Diffstat (limited to 'src/signalProcessing/ifft')
-rw-r--r-- | src/signalProcessing/ifft/difftma.c | 4 | ||||
-rw-r--r-- | src/signalProcessing/ifft/difftmx.c | 2 | ||||
-rw-r--r-- | src/signalProcessing/ifft/ir8tx.c | 4 | ||||
-rw-r--r-- | src/signalProcessing/ifft/sifftma.c | 4 | ||||
-rw-r--r-- | src/signalProcessing/ifft/zifftma.c | 12 |
5 files changed, 13 insertions, 13 deletions
diff --git a/src/signalProcessing/ifft/difftma.c b/src/signalProcessing/ifft/difftma.c index e716c4b0..67981652 100644 --- a/src/signalProcessing/ifft/difftma.c +++ b/src/signalProcessing/ifft/difftma.c @@ -20,8 +20,8 @@ void difftma ( double* in , int rows, int cols, double* out){ doubleComplex* inCpx; doubleComplex* outCpx; - ZEROS = malloc((unsigned int)(rows*cols)*sizeof(double)); - outCpx = malloc((unsigned int)(rows*cols)*sizeof(doubleComplex)); + ZEROS = (double*)malloc((unsigned int)(rows*cols)*sizeof(double)); + outCpx = (doubleComplex*)malloc((unsigned int)(rows*cols)*sizeof(doubleComplex)); dzerosa(ZEROS,rows,cols); inCpx=DoubleComplexMatrix(in,ZEROS,rows*cols); diff --git a/src/signalProcessing/ifft/difftmx.c b/src/signalProcessing/ifft/difftmx.c index a4aef2d4..5345f31a 100644 --- a/src/signalProcessing/ifft/difftmx.c +++ b/src/signalProcessing/ifft/difftmx.c @@ -142,7 +142,7 @@ int difftmx ( double* _pdblA , double* _pdblB , int _iNtot, int _iN, int _iNspan inc = abs ( isn ) ; nt = inc*ntot ; ks = inc*nspan; - rad = atan ( 1 ); + rad = atan ( double(1) ); c72 = cos (rad/0.6250); s72 = sin (rad/0.6250); diff --git a/src/signalProcessing/ifft/ir8tx.c b/src/signalProcessing/ifft/ir8tx.c index f628c1cb..325ae7a9 100644 --- a/src/signalProcessing/ifft/ir8tx.c +++ b/src/signalProcessing/ifft/ir8tx.c @@ -30,8 +30,8 @@ void ir8tx ( int nxtlt,int nthpo,int lengt, int j , kk; - double dblP7 = 1 / sqrt (2) ; - double dblPi2 = 8 * atan (1); + double dblP7 = 1 / sqrt (double(2)) ; + double dblPi2 = 8 * atan (double(1)); double scale, arg; double c1,c2,c3,c4,c5,c6,c7; diff --git a/src/signalProcessing/ifft/sifftma.c b/src/signalProcessing/ifft/sifftma.c index 0c9c2dd1..3d427917 100644 --- a/src/signalProcessing/ifft/sifftma.c +++ b/src/signalProcessing/ifft/sifftma.c @@ -20,8 +20,8 @@ void sifftma ( float* in , int rows, int cols, float* out){ floatComplex* inCpx; floatComplex* outCpx; - ZEROS = malloc((unsigned int)(rows*cols)*sizeof(float)); - outCpx = malloc((unsigned int)(rows*cols)*sizeof(floatComplex)); + ZEROS = (float*)malloc((unsigned int)(rows*cols)*sizeof(float)); + outCpx = (floatComplex*)malloc((unsigned int)(rows*cols)*sizeof(floatComplex)); szerosa(ZEROS,rows,cols); inCpx=FloatComplexMatrix(in,ZEROS,rows*cols); diff --git a/src/signalProcessing/ifft/zifftma.c b/src/signalProcessing/ifft/zifftma.c index 3b1de4cb..1ad7c461 100644 --- a/src/signalProcessing/ifft/zifftma.c +++ b/src/signalProcessing/ifft/zifftma.c @@ -51,12 +51,12 @@ void zifftma ( doubleComplex* in , int rows, int cols, doubleComplex* out) if ( rows == 1 || cols == 1 ) { - sizeTemp = (int) pow ( 2 , (int ) (log( size + 0.5 ) /log ( 2 ))) ; + sizeTemp = (int) pow ( double(2) , (int ) (log(double( size + 0.5) ) /log ( double(2) ))) ; if ( size == sizeTemp ) { - if ( size <= pow ( 2 , 15 )) + if ( size <= pow ( double(2) , double(15) )) { ifft842 ( inCopy , size , 1 ); choosenAlgo = IFFT842 ; @@ -77,12 +77,12 @@ void zifftma ( doubleComplex* in , int rows, int cols, doubleComplex* out) else { - rowsTemp = (int) pow ( 2 ,(int) (log( rows + 0.5) /log ( 2 ))) ; - colsTemp = (int) pow ( 2 ,(int) (log( cols + 0.5) /log ( 2 ))) ; + rowsTemp = (int) pow ( double(2) ,(int) (log( double(rows + 0.5)) /log ( double(2) ))) ; + colsTemp = (int) pow ( double(2) ,(int) (log( double(cols + 0.5)) /log ( double(2) ))) ; if ( rows == rowsTemp) { - if ( rows <= pow ( 2 , 15 )) + if ( rows <= pow (double(2) , 15 )) { for ( i = 0 ; i < cols ; i++ ) { @@ -106,7 +106,7 @@ void zifftma ( doubleComplex* in , int rows, int cols, doubleComplex* out) /*second call*/ if ( colsTemp == cols ) { - if ( cols <= pow ( 2 ,15) ) + if ( cols <= pow ( double(2) ,15) ) { /*compute the fft on each line of the matrix */ for (i = 0 ; i < rows ; i++ ) |