diff options
| author | Tom Rondeau | 2012-07-08 18:08:17 -0400 |
|---|---|---|
| committer | Tom Rondeau | 2012-07-08 18:08:17 -0400 |
| commit | e1cfa5eeeaebce6720dd98001c83b84218ae4d80 (patch) | |
| tree | e683b59be458d7d0c80e31b37022efcfb80667e9 /gr-filter | |
| parent | 504a14dc0f24e165d0704ca2c0321598ae86f02e (diff) | |
| download | gnuradio-e1cfa5eeeaebce6720dd98001c83b84218ae4d80.tar.gz gnuradio-e1cfa5eeeaebce6720dd98001c83b84218ae4d80.tar.bz2 gnuradio-e1cfa5eeeaebce6720dd98001c83b84218ae4d80.zip | |
filter: warning fixes.
Diffstat (limited to 'gr-filter')
| -rw-r--r-- | gr-filter/lib/pfb_channelizer_ccf_impl.cc | 3 | ||||
| -rw-r--r-- | gr-filter/lib/pfb_synthesizer_ccf_impl.cc | 3 | ||||
| -rw-r--r-- | gr-filter/lib/qa_fir_filter_with_buffer.cc | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/gr-filter/lib/pfb_channelizer_ccf_impl.cc b/gr-filter/lib/pfb_channelizer_ccf_impl.cc index ca92066f5..28fc1dcc1 100644 --- a/gr-filter/lib/pfb_channelizer_ccf_impl.cc +++ b/gr-filter/lib/pfb_channelizer_ccf_impl.cc @@ -118,8 +118,7 @@ namespace gr { if(map.size() > 0) { unsigned int max = (unsigned int)*std::max_element(map.begin(), map.end()); - unsigned int min = (unsigned int)*std::min_element(map.begin(), map.end()); - if((max >= d_nfilts) || (min < 0)) { + if(max >= d_nfilts) { throw std::invalid_argument("pfb_channelizer_ccf_impl::set_channel_map: map range out of bounds.\n"); } d_channel_map = map; diff --git a/gr-filter/lib/pfb_synthesizer_ccf_impl.cc b/gr-filter/lib/pfb_synthesizer_ccf_impl.cc index 1e9c099c1..9dd519d57 100644 --- a/gr-filter/lib/pfb_synthesizer_ccf_impl.cc +++ b/gr-filter/lib/pfb_synthesizer_ccf_impl.cc @@ -204,8 +204,7 @@ namespace gr { if(map.size() > 0) { unsigned int max = (unsigned int)*std::max_element(map.begin(), map.end()); - unsigned int min = (unsigned int)*std::min_element(map.begin(), map.end()); - if((max >= d_twox*d_numchans) || (min < 0)) { + if(max >= d_twox*d_numchans) { throw std::invalid_argument("gr_pfb_synthesizer_ccf::set_channel_map: map range out of bounds.\n"); } d_channel_map = map; diff --git a/gr-filter/lib/qa_fir_filter_with_buffer.cc b/gr-filter/lib/qa_fir_filter_with_buffer.cc index 6a1744b0a..ab2958ed1 100644 --- a/gr-filter/lib/qa_fir_filter_with_buffer.cc +++ b/gr-filter/lib/qa_fir_filter_with_buffer.cc @@ -376,7 +376,7 @@ namespace gr { new kernel::fir_filter_with_buffer_ccf(f1_taps); // zero the output, then do the filtering - memset(actual_output, 0, sizeof(actual_output)); + memset(actual_output, 0, sizeof(OUTPUT_LEN*sizeof(gr_complex))); f1->filterNdec(actual_output, input, ol/decimate, decimate); // check results |