diff options
author | cornet | 2009-04-22 08:28:41 +0000 |
---|---|---|
committer | cornet | 2009-04-22 08:28:41 +0000 |
commit | 088ab6f0fb18541245ef326f87d9150d54c6e1dc (patch) | |
tree | 8209f2be3edd8e7aaac641bdb15c59bdf27a7ef8 /src/signalProcessing/fft/zfftma.c | |
parent | ad5856216afe2447cc60005db1f30ebc97bf1dd6 (diff) | |
download | scilab2c-088ab6f0fb18541245ef326f87d9150d54c6e1dc.tar.gz scilab2c-088ab6f0fb18541245ef326f87d9150d54c6e1dc.tar.bz2 scilab2c-088ab6f0fb18541245ef326f87d9150d54c6e1dc.zip |
add signalProcessing project
Diffstat (limited to 'src/signalProcessing/fft/zfftma.c')
-rw-r--r-- | src/signalProcessing/fft/zfftma.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/signalProcessing/fft/zfftma.c b/src/signalProcessing/fft/zfftma.c index 56f13d2d..b126a0f3 100644 --- a/src/signalProcessing/fft/zfftma.c +++ b/src/signalProcessing/fft/zfftma.c @@ -48,10 +48,10 @@ void zfftma ( 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) )) { fft842 ( inCopy , size , 0 ); choosenAlgo = FFT842 ; @@ -68,12 +68,12 @@ void zfftma ( 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 , (double)15 )) { for ( i = 0 ; i < cols ; i++ ) { @@ -105,7 +105,7 @@ void zfftma ( doubleComplex* in , int rows, int cols, doubleComplex* out) /*second call*/ if ( colsTemp == cols ) { - if ( cols <= pow ( 2 ,15) ) + if ( cols <= pow ( (double)2 ,(double)15) ) { /*compute the fft on each line of the matrix */ for (i = 0 ; i < rows ; i++ ) |