diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2014-02-22 14:12:33 -0800 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2014-02-22 14:12:33 -0800 |
| commit | 77c36d3cc3bb61581621dd61aab97a9b5d1b044e (patch) | |
| tree | b23668165136e987f6711cc21a9dce3467bf2a91 | |
| parent | ade901dfbda2490f6f91e8036a57cf4742cde52e (diff) | |
| parent | e10637219f7ca5e42eff666cb18b9c49fe4a6924 (diff) | |
Merge branch 'maint'
| -rw-r--r-- | gnuradio-runtime/lib/block_executor.cc | 4 | ||||
| -rw-r--r-- | gr-blocks/lib/message_strobe_random_impl.h | 6 | ||||
| -rw-r--r-- | gr-blocks/lib/regenerate_bb_impl.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/gnuradio-runtime/lib/block_executor.cc b/gnuradio-runtime/lib/block_executor.cc index ee22ef55e3..9be8eaa48d 100644 --- a/gnuradio-runtime/lib/block_executor.cc +++ b/gnuradio-runtime/lib/block_executor.cc @@ -121,7 +121,7 @@ namespace gr { else { for(t = rtags.begin(); t != rtags.end(); t++) { tag_t new_tag = *t; - new_tag.offset *= rrate; + new_tag.offset = ((double)new_tag.offset * rrate) + 0.5; for(int o = 0; o < d->noutputs(); o++) d->output(o)->add_item_tag(new_tag); } @@ -140,7 +140,7 @@ namespace gr { std::vector<tag_t>::iterator t; for(t = rtags.begin(); t != rtags.end(); t++) { tag_t new_tag = *t; - new_tag.offset *= rrate; + new_tag.offset = ((double)new_tag.offset * rrate) + 0.5; d->output(i)->add_item_tag(new_tag); } } diff --git a/gr-blocks/lib/message_strobe_random_impl.h b/gr-blocks/lib/message_strobe_random_impl.h index a91c6604a4..277c1134af 100644 --- a/gr-blocks/lib/message_strobe_random_impl.h +++ b/gr-blocks/lib/message_strobe_random_impl.h @@ -20,8 +20,8 @@ * Boston, MA 02110-1301, USA. */ -#ifndef INCLUDED_GR_MESSAGE_STROBE_IMPL_H -#define INCLUDED_GR_MESSAGE_STROBE_IMPL_H +#ifndef INCLUDED_GR_MESSAGE_STROBE_RANDOM_IMPL_H +#define INCLUDED_GR_MESSAGE_STROBE_RANDOM_IMPL_H #include <gnuradio/blocks/message_strobe_random.h> #include <boost/random/variate_generator.hpp> @@ -70,4 +70,4 @@ namespace gr { } /* namespace blocks */ } /* namespace gr */ -#endif /* INCLUDED_GR_MESSAGE_STROBE_IMPL_H */ +#endif /* INCLUDED_GR_MESSAGE_STROBE_RANDOM_IMPL_H */ diff --git a/gr-blocks/lib/regenerate_bb_impl.h b/gr-blocks/lib/regenerate_bb_impl.h index 22b963c491..5cb7f573e7 100644 --- a/gr-blocks/lib/regenerate_bb_impl.h +++ b/gr-blocks/lib/regenerate_bb_impl.h @@ -20,7 +20,7 @@ * Boston, MA 02110-1301, USA. */ -#ifndef INCLUDED_GR_REGENERATE_BB_H +#ifndef INCLUDED_GR_REGENERATE_BB_IMPL_H #define INCLUDED_GR_REGENERATE_BB_IMPL_H #include <gnuradio/blocks/regenerate_bb.h> |