X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Flogicsnapshot.cpp;h=f77690e137d6ced0a17b3f54ba0edf18f3ee1b9d;hb=c23b29d67ed68c1a899000bf0049056fe9f51a62;hp=af6ac0e8c367a097372aeea376cef6c101785e8b;hpb=8fe602795012213fdd0ceff9efb6c6158d20f19b;p=pulseview.git

diff --git a/pv/data/logicsnapshot.cpp b/pv/data/logicsnapshot.cpp
index af6ac0e..f77690e 100644
--- a/pv/data/logicsnapshot.cpp
+++ b/pv/data/logicsnapshot.cpp
@@ -70,7 +70,7 @@ void LogicSnapshot::append_payload(
 	append_payload_to_mipmap();
 }
 
-void LogicSnapshot::reallocate_mip_map(MipMapLevel &m)
+void LogicSnapshot::reallocate_mipmap_level(MipMapLevel &m)
 {
 	const uint64_t new_data_length = ((m.length + MipMapDataUnit - 1) /
 		MipMapDataUnit) * MipMapDataUnit;
@@ -101,14 +101,12 @@ void LogicSnapshot::append_payload_to_mipmap()
 	if (m0.length == prev_length)
 		return;
 
-	reallocate_mip_map(m0);
+	reallocate_mipmap_level(m0);
 
 	dest_ptr = (uint8_t*)m0.data + prev_length * _unit_size;
 
 	// Iterate through the samples to populate the first level mipmap
-	accumulator = 0;
-	diff_counter = MipMapScaleFactor;
-	const uint8_t *end_src_ptr = (uint8_t*)_data +
+	const uint8_t *const end_src_ptr = (uint8_t*)_data +
 		m0.length * _unit_size * MipMapScaleFactor;
 	for (src_ptr = (uint8_t*)_data +
 		prev_length * _unit_size * MipMapScaleFactor;
@@ -143,12 +141,12 @@ void LogicSnapshot::append_payload_to_mipmap()
 		if (m.length == prev_length)
 			break;
 
-		reallocate_mip_map(m);
+		reallocate_mipmap_level(m);
 
 		// Subsample the level lower level
 		src_ptr = (uint8_t*)ml.data +
 			_unit_size * prev_length * MipMapScaleFactor;
-		const uint8_t *end_dest_ptr =
+		const uint8_t *const end_dest_ptr =
 			(uint8_t*)m.data + _unit_size * m.length;
 		for (dest_ptr = (uint8_t*)m.data +
 			_unit_size * prev_length;
@@ -190,7 +188,7 @@ void LogicSnapshot::get_subsampled_edges(
 	assert(start <= end);
 	assert(min_length > 0);
 	assert(sig_index >= 0);
-	assert(sig_index < SR_MAX_NUM_PROBES);
+	assert(sig_index < 64);
 
 	lock_guard<recursive_mutex> lock(_mutex);