X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Flogicsegment.cpp;h=707f797d294accad64b5ee12f1ecd1551049344d;hp=4b32f38d89992a6500293d0d462489a77a9e3243;hb=97cb532f668dd78a5100abb07d7500cbd36b6198;hpb=85a702806a15852f3684645dffdc38cb30274481

diff --git a/pv/data/logicsegment.cpp b/pv/data/logicsegment.cpp
index 4b32f38d..707f797d 100644
--- a/pv/data/logicsegment.cpp
+++ b/pv/data/logicsegment.cpp
@@ -17,6 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "config.h" // For HAVE_UNALIGNED_LITTLE_ENDIAN_ACCESS
+
 #include <extdef.h>
 
 #include <cassert>
@@ -62,7 +64,7 @@ LogicSegment::~LogicSegment()
 		free(l.data);
 }
 
-uint64_t LogicSegment::unpack_sample(const uint8_t *ptr) const
+inline uint64_t LogicSegment::unpack_sample(const uint8_t *ptr) const
 {
 #ifdef HAVE_UNALIGNED_LITTLE_ENDIAN_ACCESS
 	return *(uint64_t*)ptr;
@@ -100,7 +102,7 @@ uint64_t LogicSegment::unpack_sample(const uint8_t *ptr) const
 #endif
 }
 
-void LogicSegment::pack_sample(uint8_t *ptr, uint64_t value)
+inline void LogicSegment::pack_sample(uint8_t *ptr, uint64_t value)
 {
 #ifdef HAVE_UNALIGNED_LITTLE_ENDIAN_ACCESS
 	*(uint64_t*)ptr = value;
@@ -340,20 +342,19 @@ void LogicSegment::get_subsampled_edges(
 		level = min_level;
 
 		// We cannot fast-forward if there is no mip-map data at
-		// at the minimum level.
+		// the minimum level.
 		fast_forward = (mip_map_[level].data != nullptr);
 
 		if (min_length < MipMapScaleFactor) {
 			// Search individual samples up to the beginning of
 			// the next first level mip map block
-			const uint64_t final_index = min(end,
-				pow2_ceil(index, MipMapScalePower));
+			const uint64_t final_index = min(end, pow2_ceil(index, MipMapScalePower));
 
 			for (; index < final_index &&
 					(index & ~((uint64_t)(~0) << MipMapScalePower)) != 0;
 					index++) {
-				const bool sample =
-					(get_unpacked_sample(index) & sig_mask) != 0;
+
+				const bool sample = (get_unpacked_sample(index) & sig_mask) != 0;
 
 				// If there was a change we cannot fast forward
 				if (sample != last_sample) {
@@ -365,15 +366,13 @@ void LogicSegment::get_subsampled_edges(
 			// If resolution is less than a mip map block,
 			// round up to the beginning of the mip-map block
 			// for this level of detail
-			const int min_level_scale_power =
-				(level + 1) * MipMapScalePower;
+			const int min_level_scale_power = (level + 1) * MipMapScalePower;
 			index = pow2_ceil(index, min_level_scale_power);
 			if (index >= end)
 				break;
 
 			// We can fast forward only if there was no change
-			const bool sample =
-				(get_unpacked_sample(index) & sig_mask) != 0;
+			const bool sample = (get_unpacked_sample(index) & sig_mask) != 0;
 			if (last_sample != sample)
 				fast_forward = false;
 		}
@@ -388,32 +387,27 @@ void LogicSegment::get_subsampled_edges(
 			// Slide right and zoom out at the beginnings of mip-map
 			// blocks until we encounter a change
 			while (true) {
-				const int level_scale_power =
-					(level + 1) * MipMapScalePower;
-				const uint64_t offset =
-					index >> level_scale_power;
+				const int level_scale_power = (level + 1) * MipMapScalePower;
+				const uint64_t offset = index >> level_scale_power;
 
 				// Check if we reached the last block at this
 				// level, or if there was a change in this block
 				if (offset >= mip_map_[level].length ||
-					(get_subsample(level, offset) &
-						sig_mask))
+					(get_subsample(level, offset) &	sig_mask))
 					break;
 
 				if ((offset & ~((uint64_t)(~0) << MipMapScalePower)) == 0) {
 					// If we are now at the beginning of a
 					// higher level mip-map block ascend one
 					// level
-					if (level + 1 >= ScaleStepCount ||
-						!mip_map_[level + 1].data)
+					if ((level + 1 >= ScaleStepCount) || (!mip_map_[level + 1].data))
 						break;
 
 					level++;
 				} else {
 					// Slide right to the beginning of the
 					// next mip map block
-					index = pow2_ceil(index + 1,
-						level_scale_power);
+					index = pow2_ceil(index + 1, level_scale_power);
 				}
 			}
 
@@ -422,16 +416,13 @@ void LogicSegment::get_subsampled_edges(
 			while (true) {
 				assert(mip_map_[level].data);
 
-				const int level_scale_power =
-					(level + 1) * MipMapScalePower;
-				const uint64_t offset =
-					index >> level_scale_power;
+				const int level_scale_power = (level + 1) * MipMapScalePower;
+				const uint64_t offset = index >> level_scale_power;
 
 				// Check if we reached the last block at this
 				// level, or if there was a change in this block
 				if (offset >= mip_map_[level].length ||
-						(get_subsample(level, offset) &
-						sig_mask)) {
+						(get_subsample(level, offset) & sig_mask)) {
 					// Zoom in unless we reached the minimum
 					// zoom
 					if (level == min_level)
@@ -441,8 +432,7 @@ void LogicSegment::get_subsampled_edges(
 				} else {
 					// Slide right to the beginning of the
 					// next mip map block
-					index = pow2_ceil(index + 1,
-						level_scale_power);
+					index = pow2_ceil(index + 1, level_scale_power);
 				}
 			}
 
@@ -451,8 +441,7 @@ void LogicSegment::get_subsampled_edges(
 			// block
 			if (min_length < MipMapScaleFactor) {
 				for (; index < end; index++) {
-					const bool sample = (get_unpacked_sample(index) &
-						sig_mask) != 0;
+					const bool sample = (get_unpacked_sample(index) & sig_mask) != 0;
 					if (sample != last_sample)
 						break;
 				}
@@ -467,8 +456,7 @@ void LogicSegment::get_subsampled_edges(
 			break;
 
 		// Store the final state
-		const bool final_sample =
-			(get_unpacked_sample(final_index - 1) & sig_mask) != 0;
+		const bool final_sample = (get_unpacked_sample(final_index - 1) & sig_mask) != 0;
 		edges.emplace_back(index, final_sample);
 
 		index = final_index;