diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2013-12-21 15:39:35 -0800 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-12-21 15:39:35 -0800 |
| commit | e751e54aaeae1eb47b83169d905331b4c704b431 (patch) | |
| tree | ed5a646a08222e0c48420085103a0fe0f59e5b46 | |
| parent | f333b666577d24a02e3423f288dd8c44c96b34f3 (diff) | |
| parent | ccfd5aa3659d1ccf5e95e0b48850e9c6164a9357 (diff) | |
Merge branch 'maint'
| -rw-r--r-- | gr-blocks/examples/msg_passing/hier/test_msg_hier_topblock.grc | 14 | ||||
| -rw-r--r-- | gr-filter/lib/fft_filter.cc | 4 | ||||
| -rw-r--r-- | gr-filter/lib/pfb_decimator_ccf_impl.cc | 1 |
3 files changed, 10 insertions, 9 deletions
diff --git a/gr-blocks/examples/msg_passing/hier/test_msg_hier_topblock.grc b/gr-blocks/examples/msg_passing/hier/test_msg_hier_topblock.grc index 896e42b5e4..9cff22d6c8 100644 --- a/gr-blocks/examples/msg_passing/hier/test_msg_hier_topblock.grc +++ b/gr-blocks/examples/msg_passing/hier/test_msg_hier_topblock.grc @@ -134,10 +134,10 @@ </param> </block> <block> - <key>TEST_MSG_HIER</key> + <key>test_msg_hier</key> <param> <key>id</key> - <value>TEST_MSG_HIER_0</value> + <value>test_msg_hier_0</value> </param> <param> <key>_enabled</key> @@ -153,31 +153,31 @@ </param> </block> <connection> - <source_block_id>TEST_MSG_HIER_0</source_block_id> + <source_block_id>test_msg_hier_0</source_block_id> <sink_block_id>blocks_message_debug_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> <source_block_id>blocks_message_strobe_0</source_block_id> - <sink_block_id>TEST_MSG_HIER_0</sink_block_id> + <sink_block_id>test_msg_hier_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> <source_block_id>blocks_message_strobe_0_0</source_block_id> - <sink_block_id>TEST_MSG_HIER_0</sink_block_id> + <sink_block_id>test_msg_hier_0</sink_block_id> <source_key>0</source_key> <sink_key>1</sink_key> </connection> <connection> - <source_block_id>TEST_MSG_HIER_0</source_block_id> + <source_block_id>test_msg_hier_0</source_block_id> <sink_block_id>blocks_message_debug_0</sink_block_id> <source_key>0</source_key> <sink_key>1</sink_key> </connection> <connection> - <source_block_id>TEST_MSG_HIER_0</source_block_id> + <source_block_id>test_msg_hier_0</source_block_id> <sink_block_id>blocks_message_debug_0</sink_block_id> <source_key>1</source_key> <sink_key>0</sink_key> diff --git a/gr-filter/lib/fft_filter.cc b/gr-filter/lib/fft_filter.cc index b4cea0e6cd..829375795a 100644 --- a/gr-filter/lib/fft_filter.cc +++ b/gr-filter/lib/fft_filter.cc @@ -39,7 +39,7 @@ namespace gr { const std::vector<float> &taps, int nthreads) : d_fftsize(-1), d_decimation(decimation), d_fwdfft(0), - d_invfft(0), d_nthreads(nthreads) + d_invfft(0), d_nthreads(nthreads), d_xformed_taps(NULL) { set_taps(taps); } @@ -192,7 +192,7 @@ namespace gr { const std::vector<gr_complex> &taps, int nthreads) : d_fftsize(-1), d_decimation(decimation), d_fwdfft(0), - d_invfft(0), d_nthreads(nthreads) + d_invfft(0), d_nthreads(nthreads), d_xformed_taps(NULL) { set_taps(taps); } diff --git a/gr-filter/lib/pfb_decimator_ccf_impl.cc b/gr-filter/lib/pfb_decimator_ccf_impl.cc index feb36a5999..19cf20f410 100644 --- a/gr-filter/lib/pfb_decimator_ccf_impl.cc +++ b/gr-filter/lib/pfb_decimator_ccf_impl.cc @@ -58,6 +58,7 @@ namespace gr { pfb_decimator_ccf_impl::~pfb_decimator_ccf_impl() { + delete d_rotator; } void |