X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Flogicsnapshot.cpp;h=f896ed178718dd2dc6f840c6567dcba15c4220e2;hb=d9aecf1fcd9af471db3b59de7efc65b9632a6d79;hp=444fa9ec4ceea93194dd02ce2f8aa8cfdb8a37a1;hpb=9df8453f6809f2ce038717111979474a60d5746a;p=pulseview.git diff --git a/pv/data/logicsnapshot.cpp b/pv/data/logicsnapshot.cpp index 444fa9e..f896ed1 100644 --- a/pv/data/logicsnapshot.cpp +++ b/pv/data/logicsnapshot.cpp @@ -25,8 +25,6 @@ #include #include -#include - #include "config.h" #include "logicsnapshot.h" @@ -59,7 +57,7 @@ LogicSnapshot::LogicSnapshot(const sr_datafeed_logic &logic, LogicSnapshot::~LogicSnapshot() { lock_guard lock(_mutex); - BOOST_FOREACH(MipMapLevel &l, _mip_map) + for (MipMapLevel &l : _mip_map) free(l.data); } @@ -164,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, size); + memcpy(data, (const uint8_t*)_data + start_sample * _unit_size, size); } void LogicSnapshot::reallocate_mipmap_level(MipMapLevel &m)