summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rondeau2012-02-01 17:20:53 -0500
committerTom Rondeau2012-02-01 17:20:53 -0500
commit7403f9f0611e44e91cc33d6aace182e041af2152 (patch)
treed58044a5725fc5f415a7d21a01119d6498f62a7c
parent9adfc42e0296d969a498249d837e29bf46bf65a9 (diff)
parentf122d72a1090d38d1a08f98c56e0d071f79fef0b (diff)
downloadgnuradio-7403f9f0611e44e91cc33d6aace182e041af2152.tar.gz
gnuradio-7403f9f0611e44e91cc33d6aace182e041af2152.tar.bz2
gnuradio-7403f9f0611e44e91cc33d6aace182e041af2152.zip
Merge branch 'maint' of gnuradio.org:gnuradio into maint
-rw-r--r--gnuradio-core/src/lib/general/gr_fft_vcc_fftw.cc2
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];