From 542b19a0b4a48fab3b1f773caa889e52ce417e85 Mon Sep 17 00:00:00 2001 From: John Glover Date: Mon, 24 Sep 2012 11:16:02 +0200 Subject: [base] Bug fix: set peak and partial vectors to NULL when clearing rather than emptying the vectors. Check that current number of peaks/partials does not excede the max when adding new peaks/partials. --- src/simpl/base.cpp | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/src/simpl/base.cpp b/src/simpl/base.cpp index c97e8bc..75e0697 100644 --- a/src/simpl/base.cpp +++ b/src/simpl/base.cpp @@ -98,12 +98,12 @@ void Frame::clear() { } void Frame::clear_peaks() { - _peaks.clear(); + _peaks.assign(_max_peaks, NULL); _num_peaks = 0; } void Frame::clear_partials() { - _partials.clear(); + _partials.assign(_max_peaks, NULL); _num_partials = 0; } @@ -144,6 +144,13 @@ void Frame::max_peaks(int new_max_peaks) { } void Frame::add_peak(Peak* peak) { + if(_num_peaks >= _max_peaks) { + printf("Warning: attempted to add more than the specified" + " maximum number of peaks (%d) to a frame, ignoring.\n", + _max_peaks); + return; + } + _peaks[_num_peaks] = peak; _num_peaks++; } @@ -184,6 +191,13 @@ void Frame::max_partials(int new_max_partials) { } void Frame::add_partial(Peak* peak) { + if(_num_partials >= _max_partials) { + printf("Warning: attempted to add more than the specified" + " maximum number of partials (%d) to a frame, ignoring.\n", + _max_partials); + return; + } + _partials[_num_partials] = peak; _num_partials++; } -- cgit v1.2.3