diff options
| author | eb | 2007-09-05 16:56:30 +0000 |
|---|---|---|
| committer | eb | 2007-09-05 16:56:30 +0000 |
| commit | 6377a536a6aff4a914494299679ddc223e2cf3c9 (patch) | |
| tree | 60402f38a4abad1b42ad11788cc24f3429f64ef5 /gnuradio-core/src | |
| parent | c40929faf2ef4dc93be9df246b1370cea3849d45 (diff) | |
| download | gnuradio-6377a536a6aff4a914494299679ddc223e2cf3c9.tar.gz gnuradio-6377a536a6aff4a914494299679ddc223e2cf3c9.tar.bz2 gnuradio-6377a536a6aff4a914494299679ddc223e2cf3c9.zip | |
Applied patch from Richard Alimi
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@6316 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gnuradio-core/src')
| -rw-r--r-- | gnuradio-core/src/lib/general/gr_map_bb.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnuradio-core/src/lib/general/gr_map_bb.cc b/gnuradio-core/src/lib/general/gr_map_bb.cc index 491316f70..b10dfea36 100644 --- a/gnuradio-core/src/lib/general/gr_map_bb.cc +++ b/gnuradio-core/src/lib/general/gr_map_bb.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2006 Free Software Foundation, Inc. + * Copyright 2006,2007 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -41,7 +41,7 @@ gr_map_bb::gr_map_bb (const std::vector<int> &map) for (int i = 0; i < 0x100; i++) d_map[i] = i; - unsigned int size = std::max((size_t) 0x100, map.size()); + unsigned int size = std::min((size_t) 0x100, map.size()); for (unsigned int i = 0; i < size; i++) d_map[i] = map[i]; } |