diff options
| author | Tom Rondeau | 2012-10-01 17:37:35 -0400 |
|---|---|---|
| committer | Tom Rondeau | 2012-10-01 17:37:35 -0400 |
| commit | b31ea99bf07cb66f1dab3cea94f9f792f6cab2fc (patch) | |
| tree | 452329e4e262b2da3b690d12493f1b44c8d84160 /gnuradio-core/src/lib/general/gr_skiphead.cc | |
| parent | 21b39825df56f0353f6f9e60f06c1ded38f9df81 (diff) | |
| parent | 65ea256f8de15b7a23c602f9775edf0636b3732c (diff) | |
| download | gnuradio-b31ea99bf07cb66f1dab3cea94f9f792f6cab2fc.tar.gz gnuradio-b31ea99bf07cb66f1dab3cea94f9f792f6cab2fc.tar.bz2 gnuradio-b31ea99bf07cb66f1dab3cea94f9f792f6cab2fc.zip | |
Merge branch 'master' of gnuradio.org:gnuradio
Diffstat (limited to 'gnuradio-core/src/lib/general/gr_skiphead.cc')
| -rw-r--r-- | gnuradio-core/src/lib/general/gr_skiphead.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnuradio-core/src/lib/general/gr_skiphead.cc b/gnuradio-core/src/lib/general/gr_skiphead.cc index c887376e4..7b441bea9 100644 --- a/gnuradio-core/src/lib/general/gr_skiphead.cc +++ b/gnuradio-core/src/lib/general/gr_skiphead.cc @@ -43,14 +43,14 @@ gr_make_skiphead (size_t itemsize, uint64_t nitems_to_skip) int gr_skiphead::general_work(int noutput_items, - gr_vector_int &ninput_items_ignored, + gr_vector_int &ninput_items_, gr_vector_const_void_star &input_items, gr_vector_void_star &output_items) { const char *in = (const char *) input_items[0]; char *out = (char *) output_items[0]; - int ninput_items = noutput_items; // we've got at least this many input items + int ninput_items = std::min(ninput_items_[0], noutput_items); int ii = 0; // input index while (ii < ninput_items){ |