diff options
| author |  Marton Danoczy <marton78@gmail.com> | 2009-12-03 14:01:34 +0100 |
|---|---|---|
| committer | Marton Danoczy <marton78@gmail.com> | 2009-12-03 14:01:34 +0100 |
| commit | ffaea19a70d22657008645e97a0b9efe2fcc9451 (patch) | |
| tree | 018efdb83c1f725113bcdab45db24ae1ba6d424a /unsupported/Eigen/src/FFT | |
| parent | af17770680f23fe3d858cb461b4983795f7e8810 (diff) | |
Fixed compilation warnings in MSVC with Scalar==float
Diffstat (limited to 'unsupported/Eigen/src/FFT')
| -rw-r--r-- | unsupported/Eigen/src/FFT/ei_kissfft_impl.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/unsupported/Eigen/src/FFT/ei_kissfft_impl.h b/unsupported/Eigen/src/FFT/ei_kissfft_impl.h index 5c958d1ec..2dff2bd00 100644 --- a/unsupported/Eigen/src/FFT/ei_kissfft_impl.h +++ b/unsupported/Eigen/src/FFT/ei_kissfft_impl.h @@ -160,7 +160,7 @@ struct ei_kiss_cpx_fft scratch[0]=scratch[1]-scratch[2]; tw1 += fstride; tw2 += fstride*2; - Fout[m] = Complex( Fout->real() - .5*scratch[3].real() , Fout->imag() - .5*scratch[3].imag() ); + Fout[m] = Complex( Fout->real() - Scalar(.5)*scratch[3].real() , Fout->imag() - Scalar(.5)*scratch[3].imag() ); scratch[0] *= epi3.imag(); *Fout += scratch[3]; Fout[m2] = Complex( Fout[m].real() + scratch[0].imag() , Fout[m].imag() - scratch[0].real() ); @@ -377,10 +377,10 @@ struct ei_kissfft_impl std::vector<Complex> m_tmpBuf2; inline - int PlanKey(int nfft,bool isinverse) const { return (nfft<<1) | isinverse; } + int PlanKey(int nfft, bool isinverse) const { return (nfft<<1) | int(isinverse); } inline - PlanData & get_plan(int nfft,bool inverse) + PlanData & get_plan(int nfft, bool inverse) { // TODO look for PlanKey(nfft, ! inverse) and conjugate the twiddles PlanData & pd = m_plans[ PlanKey(nfft,inverse) ]; @@ -400,7 +400,7 @@ struct ei_kissfft_impl int ncfft= ncfft2<<1; Scalar pi = acos( Scalar(-1) ); for (int k=1;k<=ncfft2;++k) - twidref[k-1] = exp( Complex(0,-pi * ((double) (k) / ncfft + .5) ) ); + twidref[k-1] = exp( Complex(0,-pi * (Scalar(k) / ncfft + Scalar(.5)) ) ); } return &twidref[0]; } |