X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Flogicsegment.cpp;h=be56c1505263fd44c19901ce8b055112f6888378;hb=69e950969e45ddbf516069c28f72f5696c53af5d;hp=a7df235a32d1c7a613de2824b14ca5ae6edff113;hpb=720f47623827824dc77dd9dff643c06e570d9068;p=pulseview.git diff --git a/pv/data/logicsegment.cpp b/pv/data/logicsegment.cpp index a7df235a..be56c150 100644 --- a/pv/data/logicsegment.cpp +++ b/pv/data/logicsegment.cpp @@ -63,10 +63,24 @@ LogicSegment::LogicSegment(pv::data::Logic& owner, uint32_t segment_id, LogicSegment::~LogicSegment() { lock_guard lock(mutex_); + for (MipMapLevel &l : mip_map_) free(l.data); } +shared_ptr LogicSegment::get_shared_ptr() const +{ + shared_ptr ptr = nullptr; + + try { + ptr = shared_from_this(); + } catch (std::exception& e) { + /* Do nothing, ptr remains a null pointer */ + } + + return ptr ? std::dynamic_pointer_cast(ptr) : nullptr; +} + template void LogicSegment::downsampleTmain(const T*&in, T &acc, T &prev) { @@ -328,6 +342,7 @@ void LogicSegment::append_payload(shared_ptr logic) void LogicSegment::append_payload(void *data, uint64_t data_size) { + assert(unit_size_ > 0); assert((data_size % unit_size_) == 0); lock_guard lock(mutex_);