diff options
| author | Tom Rondeau <tom@trondeau.com> | 2014-01-10 16:27:29 -0500 |
|---|---|---|
| committer | Tom Rondeau <tom@trondeau.com> | 2014-01-10 16:27:29 -0500 |
| commit | edaaafc6f567e1e8b9af0674f7244e064706d282 (patch) | |
| tree | 6a03ad78334d5e5cb972c6b383bdbb58864ce9b7 /gr-atsc | |
| parent | cbd21fccd6108ed2568508e72073ab1fc02604c7 (diff) | |
| parent | 43ab0789f6b2b92a703bc74475e4734ba2eb64a8 (diff) | |
Merge branch 'maint'
Conflicts:
volk/apps/volk_profile.cc
Diffstat (limited to 'gr-atsc')
| -rw-r--r-- | gr-atsc/lib/qa_atsci_equalizer_nop.cc | 6 | ||||
| -rw-r--r-- | gr-atsc/lib/qa_atsci_viterbi_decoder.cc | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/gr-atsc/lib/qa_atsci_equalizer_nop.cc b/gr-atsc/lib/qa_atsci_equalizer_nop.cc index 098d745db3..b7aad835d5 100644 --- a/gr-atsc/lib/qa_atsci_equalizer_nop.cc +++ b/gr-atsc/lib/qa_atsci_equalizer_nop.cc @@ -200,9 +200,9 @@ qa_atsci_equalizer_nop::t0 () try { - memset (input_data, 0, sizeof (input_data)); - memset (input_tags, 0, sizeof (input_tags)); - memset (output_data, 0, sizeof (output_data)); + memset (input_data, 0, sizeof(*input_data)*INPUT_SIZE); + memset (input_tags, 0, sizeof(*input_tags)*INPUT_SIZE); + memset (output_data, 0, sizeof(*output_data)*INPUT_SIZE); setup_test_data (input_data, input_tags); diff --git a/gr-atsc/lib/qa_atsci_viterbi_decoder.cc b/gr-atsc/lib/qa_atsci_viterbi_decoder.cc index cd19804765..7f72b22c14 100644 --- a/gr-atsc/lib/qa_atsci_viterbi_decoder.cc +++ b/gr-atsc/lib/qa_atsci_viterbi_decoder.cc @@ -51,7 +51,7 @@ map_to_soft_symbols (atsc_soft_data_segment &out, static void pad_decoder_input (atsc_soft_data_segment out[NCODERS]) { - memset (out, 0, sizeof (out)); + memset(out, 0, sizeof(*out)*NCODERS); // add data segment sync for (int i = 0; i < NCODERS; i++){ |