diff options
| author | Johnathan Corgan | 2010-08-02 16:13:07 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2010-08-02 16:13:07 -0700 |
| commit | 8034e2cd49fd71bfdf1ed587d49781a444e1cced (patch) | |
| tree | af9eda47cf1279e6b313688e8f8d3b1b2d43a969 /gnuradio-core | |
| parent | c76f5838e370ae71ec10d7eba0d30466a2caf73b (diff) | |
| download | gnuradio-8034e2cd49fd71bfdf1ed587d49781a444e1cced.tar.gz gnuradio-8034e2cd49fd71bfdf1ed587d49781a444e1cced.tar.bz2 gnuradio-8034e2cd49fd71bfdf1ed587d49781a444e1cced.zip | |
Revert "gnuradio-core: allows configuring FFTW to use ESTIMATE vs. MEASURE"
This reverts commit f23a2b33ca1bebf0c3a5fa26fdcff11827744b77.
This change introduced a segfault when calling into the gr_prefs module
during the gri_fft helper class constructor. Until this is debugged,
the functionality is being reverted.
Diffstat (limited to 'gnuradio-core')
| -rw-r--r-- | gnuradio-core/src/lib/general/gri_fft.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/gnuradio-core/src/lib/general/gri_fft.cc b/gnuradio-core/src/lib/general/gri_fft.cc index 1ce14eefd..e535f28c7 100644 --- a/gnuradio-core/src/lib/general/gri_fft.cc +++ b/gnuradio-core/src/lib/general/gri_fft.cc @@ -28,7 +28,6 @@ #include <stdio.h> #include <cassert> #include <stdexcept> -#include <gr_prefs.h> boost::mutex & @@ -114,9 +113,7 @@ gri_fft_complex::gri_fft_complex (int fft_size, bool forward) reinterpret_cast<fftwf_complex *>(d_inbuf), reinterpret_cast<fftwf_complex *>(d_outbuf), forward ? FFTW_FORWARD : FFTW_BACKWARD, - gr_prefs::singleton()->get_bool("fftw", "estimate", false) == true ? FFTW_ESTIMATE - : FFTW_MEASURE); - + FFTW_MEASURE); if (d_plan == NULL) { fprintf(stderr, "gri_fft_complex: error creating plan\n"); @@ -168,8 +165,7 @@ gri_fft_real_fwd::gri_fft_real_fwd (int fft_size) d_plan = fftwf_plan_dft_r2c_1d (fft_size, d_inbuf, reinterpret_cast<fftwf_complex *>(d_outbuf), - gr_prefs::singleton()->get_bool("fftw", "estimate", false) == true ? FFTW_ESTIMATE - : FFTW_MEASURE); + FFTW_MEASURE); if (d_plan == NULL) { fprintf(stderr, "gri_fft_real_fwd: error creating plan\n"); |