diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2013-09-25 08:43:59 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-09-25 08:43:59 -0700 |
| commit | 5cfb11516f028f4e6a9e02c2bff0c2b1358fd880 (patch) | |
| tree | 172296b2ce99a8546797bd603d2bd6d827bf1716 | |
| parent | 9792b280d2b49e0f0d8ff0b4a9ace8fd6dbc8fea (diff) | |
| parent | 57ed3253d51788bdbba7502322c5ee4dc3ffb1de (diff) | |
Merge branch 'maint'
| -rw-r--r-- | gnuradio-runtime/lib/pmt/pmt_serialize.cc | 2 | ||||
| -rw-r--r-- | gr-analog/lib/pwr_squelch_cc_impl.cc | 2 | ||||
| -rw-r--r-- | gr-analog/lib/pwr_squelch_ff_impl.cc | 2 | ||||
| -rw-r--r-- | gr-fec/lib/decode_ccsds_27_fb_impl.cc | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/gnuradio-runtime/lib/pmt/pmt_serialize.cc b/gnuradio-runtime/lib/pmt/pmt_serialize.cc index 4036b8d8bd..56e92a15d5 100644 --- a/gnuradio-runtime/lib/pmt/pmt_serialize.cc +++ b/gnuradio-runtime/lib/pmt/pmt_serialize.cc @@ -577,7 +577,7 @@ deserialize(std::streambuf &sb) case PST_COMPLEX: { double r,i; - if(!deserialize_untagged_f64(&r, sb) && !deserialize_untagged_f64(&i, sb)) + if(!deserialize_untagged_f64(&r, sb) || !deserialize_untagged_f64(&i, sb)) goto error; return make_rectangular( r,i ); } diff --git a/gr-analog/lib/pwr_squelch_cc_impl.cc b/gr-analog/lib/pwr_squelch_cc_impl.cc index 44fd5dc668..6c832bc392 100644 --- a/gr-analog/lib/pwr_squelch_cc_impl.cc +++ b/gr-analog/lib/pwr_squelch_cc_impl.cc @@ -43,7 +43,7 @@ namespace gr { io_signature::make(1, 1, sizeof(gr_complex)), io_signature::make(1, 1, sizeof(gr_complex))), squelch_base_cc_impl("pwr_squelch_cc", ramp, gate), - d_iir(alpha) + d_pwr(0), d_iir(alpha) { set_threshold(threshold); } diff --git a/gr-analog/lib/pwr_squelch_ff_impl.cc b/gr-analog/lib/pwr_squelch_ff_impl.cc index 812011bbb5..955f2fc630 100644 --- a/gr-analog/lib/pwr_squelch_ff_impl.cc +++ b/gr-analog/lib/pwr_squelch_ff_impl.cc @@ -43,7 +43,7 @@ namespace gr { io_signature::make(1, 1, sizeof(float)), io_signature::make(1, 1, sizeof(float))), squelch_base_ff_impl("pwr_squelch_ff", ramp, gate), - d_iir(alpha) + d_pwr(0), d_iir(alpha) { set_threshold(threshold); } diff --git a/gr-fec/lib/decode_ccsds_27_fb_impl.cc b/gr-fec/lib/decode_ccsds_27_fb_impl.cc index 7c0f3026ab..014297caef 100644 --- a/gr-fec/lib/decode_ccsds_27_fb_impl.cc +++ b/gr-fec/lib/decode_ccsds_27_fb_impl.cc @@ -39,7 +39,7 @@ namespace gr { : sync_decimator("decode_ccsds_27_fb", io_signature::make (1, 1, sizeof(float)), io_signature::make (1, 1, sizeof(char)), - 2*8) // Rate 1/2 code, unpacked to packed conversion + 2*8), d_count(0) // Rate 1/2 code, unpacked to packed conversion { float RATE = 0.5; float ebn0 = 12.0; |