X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Flogicsnapshot.cpp;h=825d2f1f51f6ea59d93883ec3178e68a11675e54;hp=3bd43c9208182e92bed8d46b8bea108d1e1af4c5;hb=611d50a5b44c0ffa914360f13b2737778def0f07;hpb=3b68d03ddae96edb38a80f31bf6a990bde21cd1d

diff --git a/pv/data/logicsnapshot.cpp b/pv/data/logicsnapshot.cpp
index 3bd43c92..825d2f1f 100644
--- a/pv/data/logicsnapshot.cpp
+++ b/pv/data/logicsnapshot.cpp
@@ -162,7 +162,7 @@ void LogicSnapshot::get_samples(uint8_t *const data,
 	lock_guard<recursive_mutex> 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;)
 	{
@@ -263,10 +263,9 @@ void LogicSnapshot::append_payload_to_mipmap()
 
 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(