X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Flogicsnapshot.cpp;h=f1ff3c3c267fbf14a7fa56aba4b6a48843c0b1dd;hp=f896ed178718dd2dc6f840c6567dcba15c4220e2;hb=c82c7e4e330ce5aa04c4f3b8e6f8de85e3e288e1;hpb=d9aecf1fcd9af471db3b59de7efc65b9632a6d79 diff --git a/pv/data/logicsnapshot.cpp b/pv/data/logicsnapshot.cpp index f896ed17..f1ff3c3c 100644 --- a/pv/data/logicsnapshot.cpp +++ b/pv/data/logicsnapshot.cpp @@ -28,8 +28,8 @@ #include "config.h" #include "logicsnapshot.h" -using boost::lock_guard; -using boost::recursive_mutex; +using std::lock_guard; +using std::recursive_mutex; using std::max; using std::min; using std::pair; @@ -162,7 +162,7 @@ void LogicSnapshot::get_samples(uint8_t *const data, lock_guard lock(_mutex); const size_t size = (end_sample - start_sample) * _unit_size; - memcpy(data, (const uint8_t*)_data + start_sample * _unit_size, size); + memcpy(data, (const uint8_t*)_data.data() + start_sample * _unit_size, size); } void LogicSnapshot::reallocate_mipmap_level(MipMapLevel &m) @@ -201,9 +201,9 @@ void LogicSnapshot::append_payload_to_mipmap() dest_ptr = (uint8_t*)m0.data + prev_length * _unit_size; // Iterate through the samples to populate the first level mipmap - const uint8_t *const end_src_ptr = (uint8_t*)_data + + const uint8_t *const end_src_ptr = (uint8_t*)_data.data() + m0.length * _unit_size * MipMapScaleFactor; - for (src_ptr = (uint8_t*)_data + + for (src_ptr = (uint8_t*)_data.data() + prev_length * _unit_size * MipMapScaleFactor; src_ptr < end_src_ptr;) { @@ -266,7 +266,7 @@ uint64_t LogicSnapshot::get_sample(uint64_t index) const assert(_data); assert(index < _sample_count); - return unpack_sample((uint8_t*)_data + index * _unit_size); + return unpack_sample((uint8_t*)_data.data() + index * _unit_size); } void LogicSnapshot::get_subsampled_edges(