From 023887ca1d8a104b4bef287b7cea8d403044a41b Mon Sep 17 00:00:00 2001
From: Joel Holdsworth <joel@airwebreathe.org.uk>
Date: Sat, 16 Mar 2013 10:11:18 +0000
Subject: [PATCH] Various tidyups in LogicSnapshot

---
 pv/data/logicsnapshot.cpp | 12 +++++-------
 pv/data/logicsnapshot.h   | 12 ++++++------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/pv/data/logicsnapshot.cpp b/pv/data/logicsnapshot.cpp
index af6ac0e8..e6fd26e3 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;
diff --git a/pv/data/logicsnapshot.h b/pv/data/logicsnapshot.h
index 8a851ac2..9868a212 100644
--- a/pv/data/logicsnapshot.h
+++ b/pv/data/logicsnapshot.h
@@ -27,11 +27,11 @@
 #include <vector>
 
 namespace LogicSnapshotTest {
-	class Pow2;
-	class Basic;
-	class LargeData;
-	class Pulses;
-	class LongPulses;
+class Pow2;
+class Basic;
+class LargeData;
+class Pulses;
+class LongPulses;
 }
 
 namespace pv {
@@ -65,7 +65,7 @@ public:
 	void append_payload(const sr_datafeed_logic &logic);
 
 private:
-	void reallocate_mip_map(MipMapLevel &m);
+	void reallocate_mipmap_level(MipMapLevel &m);
 
 	void append_payload_to_mipmap();
 
-- 
2.30.2