X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fdata%2Fanalogsnapshot.cpp;h=2a14d1ea0a0f37bf7687ca3f2f48f864e1849497;hb=be9e7b4bb29b6594ec2b64442748ab135b684bf8;hp=ab968cf7362332667e2402b2cf8f59338c1a621c;hpb=d9aecf1fcd9af471db3b59de7efc65b9632a6d79;p=pulseview.git diff --git a/pv/data/analogsnapshot.cpp b/pv/data/analogsnapshot.cpp index ab968cf7..2a14d1ea 100644 --- a/pv/data/analogsnapshot.cpp +++ b/pv/data/analogsnapshot.cpp @@ -29,8 +29,8 @@ #include "analogsnapshot.h" -using boost::lock_guard; -using boost::recursive_mutex; +using std::lock_guard; +using std::recursive_mutex; using std::max; using std::max_element; using std::min; @@ -68,9 +68,9 @@ void AnalogSnapshot::append_interleaved_samples(const float *data, lock_guard lock(_mutex); - _data = realloc(_data, (_sample_count + sample_count) * sizeof(float)); + _data.resize((_sample_count + sample_count) * sizeof(float)); - float *dst = (float*)_data + _sample_count; + float *dst = (float*)_data.data() + _sample_count; const float *dst_end = dst + sample_count; while (dst != dst_end) { @@ -96,7 +96,7 @@ const float* AnalogSnapshot::get_samples( lock_guard lock(_mutex); float *const data = new float[end_sample - start_sample]; - memcpy(data, (float*)_data + start_sample, sizeof(float) * + memcpy(data, (float*)_data.data() + start_sample, sizeof(float) * (end_sample - start_sample)); return data; } @@ -156,9 +156,9 @@ void AnalogSnapshot::append_payload_to_envelope_levels() dest_ptr = e0.samples + prev_length; // Iterate through the samples to populate the first level mipmap - const float *const end_src_ptr = (float*)_data + + const float *const end_src_ptr = (float*)_data.data() + e0.length * EnvelopeScaleFactor; - for (const float *src_ptr = (float*)_data + + for (const float *src_ptr = (float*)_data.data() + prev_length * EnvelopeScaleFactor; src_ptr < end_src_ptr; src_ptr += EnvelopeScaleFactor) {