diff options
| author | Johnathan Corgan | 2012-01-25 16:36:11 -0800 |
|---|---|---|
| committer | Johnathan Corgan | 2012-01-25 16:36:11 -0800 |
| commit | f87aef68a654d665ff1a773647dc1d5c9c5c9786 (patch) | |
| tree | 842b44885fae97b6db56113688016ff9ef5f9688 | |
| parent | 242626ea07d3c81d03a1e6e01c5995a03d0566ee (diff) | |
| parent | 8ddd8fbb0d780072081215db432aaf59d4a46dda (diff) | |
| download | gnuradio-f87aef68a654d665ff1a773647dc1d5c9c5c9786.tar.gz gnuradio-f87aef68a654d665ff1a773647dc1d5c9c5c9786.tar.bz2 gnuradio-f87aef68a654d665ff1a773647dc1d5c9c5c9786.zip | |
Merge branch 'master' into next
| -rw-r--r-- | gnuradio-core/src/lib/general/gr_fft_vcc_fftw.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gnuradio-core/src/lib/general/gr_fft_vcc_fftw.cc b/gnuradio-core/src/lib/general/gr_fft_vcc_fftw.cc index c66015c11..948ab20b9 100644 --- a/gnuradio-core/src/lib/general/gr_fft_vcc_fftw.cc +++ b/gnuradio-core/src/lib/general/gr_fft_vcc_fftw.cc @@ -68,7 +68,7 @@ gr_fft_vcc_fftw::work (int noutput_items, if (d_window.size()){ gr_complex *dst = d_fft->get_inbuf(); if(!d_forward && d_shift){ - int offset = (!d_forward && d_shift)?floor(d_fft_size/2):0; + int offset = (!d_forward && d_shift)?(d_fft_size/2):0; int fft_m_offset = d_fft_size - offset; for (unsigned int i = 0; i < offset; i++) // apply window dst[i+fft_m_offset] = in[i] * d_window[i]; |