From 8034e2cd49fd71bfdf1ed587d49781a444e1cced Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Mon, 2 Aug 2010 16:13:07 -0700 Subject: [PATCH] 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. --- gnuradio-core/src/lib/general/gri_fft.cc | 8 ++------ 1 file 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 1ce14eef..e535f28c 100644 --- a/gnuradio-core/src/lib/general/gri_fft.cc +++ b/gnuradio-core/src/lib/general/gri_fft.cc @@ -28,7 +28,6 @@ #include #include #include -#include boost::mutex & @@ -114,9 +113,7 @@ gri_fft_complex::gri_fft_complex (int fft_size, bool forward) reinterpret_cast(d_inbuf), reinterpret_cast(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(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"); -- 2.30.2