[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 03/09: qtgui: fixed a stray +1 that was dup
From: |
git |
Subject: |
[Commit-gnuradio] [gnuradio] 03/09: qtgui: fixed a stray +1 that was duplicating tags. |
Date: |
Sun, 21 Feb 2016 15:39:13 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch maint
in repository gnuradio.
commit 860b200ee26dde30cf2cd8ad455305754d663c52
Author: Tom Rondeau <address@hidden>
Date: Wed Dec 30 16:26:07 2015 -0500
qtgui: fixed a stray +1 that was duplicating tags.
When this was looking at the very end of the buffer, the +1 was a
look-ahead based on history; but this would then become the 0th
element the next call to work and would double up on that tag.
---
gr-qtgui/lib/time_sink_c_impl.cc | 2 +-
gr-qtgui/lib/time_sink_f_impl.cc | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/gr-qtgui/lib/time_sink_c_impl.cc b/gr-qtgui/lib/time_sink_c_impl.cc
index 9f1a04c..7e5aabf 100644
--- a/gr-qtgui/lib/time_sink_c_impl.cc
+++ b/gr-qtgui/lib/time_sink_c_impl.cc
@@ -652,7 +652,7 @@ namespace gr {
uint64_t nr = nitems_read(n);
std::vector<gr::tag_t> tags;
- get_tags_in_range(tags, n, nr, nr + nitems + 1);
+ get_tags_in_range(tags, n, nr, nr + nitems);
for(size_t t = 0; t < tags.size(); t++) {
tags[t].offset = tags[t].offset - nr + (d_index-d_start-1);
}
diff --git a/gr-qtgui/lib/time_sink_f_impl.cc b/gr-qtgui/lib/time_sink_f_impl.cc
index e81a9f4..579dfd9 100644
--- a/gr-qtgui/lib/time_sink_f_impl.cc
+++ b/gr-qtgui/lib/time_sink_f_impl.cc
@@ -643,7 +643,7 @@ namespace gr {
uint64_t nr = nitems_read(idx);
std::vector<gr::tag_t> tags;
- get_tags_in_range(tags, idx, nr, nr + nitems + 1);
+ get_tags_in_range(tags, idx, nr, nr + nitems);
for(size_t t = 0; t < tags.size(); t++) {
tags[t].offset = tags[t].offset - nr + (d_index-d_start-1);
}
- [Commit-gnuradio] [gnuradio] branch maint updated (e2c5119 -> 3a2cf6e), git, 2016/02/21
- [Commit-gnuradio] [gnuradio] 07/09: Merge remote-tracking branch 'tom/qtgui_off_by_1' into maint, git, 2016/02/21
- [Commit-gnuradio] [gnuradio] 08/09: Merge remote-tracking branch 'mbr0wn/uhd/fix_antenna_split' into maint, git, 2016/02/21
- [Commit-gnuradio] [gnuradio] 06/09: Fix compilation in gcc-6, git, 2016/02/21
- [Commit-gnuradio] [gnuradio] 04/09: uhd: Fix bug #901: Default antenna value causes app to fail, git, 2016/02/21
- [Commit-gnuradio] [gnuradio] 03/09: qtgui: fixed a stray +1 that was duplicating tags.,
git <=
- [Commit-gnuradio] [gnuradio] 09/09: Merge remote-tracking branch 'mbr0wn/blocks/tagged_stream_align_tags' into maint, git, 2016/02/21
- [Commit-gnuradio] [gnuradio] 01/09: grc: remove position offset when pasting blocks into an empty flow graph, git, 2016/02/21
- [Commit-gnuradio] [gnuradio] 02/09: grc: ignore unknown block keys when pasting blocks, git, 2016/02/21
- [Commit-gnuradio] [gnuradio] 05/09: blocks: Fixed bug #903: tagged_stream_align duplicates tags, git, 2016/02/21