X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fanalogsegment.cpp;h=cd4384ddd799cb1cdf392c7b2106ccfb6bd14bc0;hp=c1a119e4cd13305f3caa91f98c6a420ab918d927;hb=0f8f8c180b32413177f3940ea6f216d1cbadf09b;hpb=d9e717371c60f8c5ace007619da1b041f4db4e25

diff --git a/pv/data/analogsegment.cpp b/pv/data/analogsegment.cpp
index c1a119e4..cd4384dd 100644
--- a/pv/data/analogsegment.cpp
+++ b/pv/data/analogsegment.cpp
@@ -69,12 +69,12 @@ void AnalogSegment::append_interleaved_samples(const float *data,
 
 	lock_guard<recursive_mutex> lock(mutex_);
 
+	// If we're out of memory, this will throw std::bad_alloc
 	data_.resize((sample_count_ + sample_count) * sizeof(float));
 
 	float *dst = (float*)data_.data() + sample_count_;
 	const float *dst_end = dst + sample_count;
-	while (dst != dst_end)
-	{
+	while (dst != dst_end) {
 		*dst++ = *data;
 		data += stride;
 	}
@@ -130,8 +130,7 @@ void AnalogSegment::reallocate_envelope(Envelope &e)
 {
 	const uint64_t new_data_length = ((e.length + EnvelopeDataUnit - 1) /
 		EnvelopeDataUnit) * EnvelopeDataUnit;
-	if (new_data_length > e.data_length)
-	{
+	if (new_data_length > e.data_length) {
 		e.data_length = new_data_length;
 		e.samples = (EnvelopeSample*)realloc(e.samples,
 			new_data_length * sizeof(EnvelopeSample));
@@ -160,9 +159,8 @@ void AnalogSegment::append_payload_to_envelope_levels()
 	const float *const end_src_ptr = (float*)data_.data() +
 		e0.length * EnvelopeScaleFactor;
 	for (const float *src_ptr = (float*)data_.data() +
-		prev_length * EnvelopeScaleFactor;
-		src_ptr < end_src_ptr; src_ptr += EnvelopeScaleFactor)
-	{
+			prev_length * EnvelopeScaleFactor;
+			src_ptr < end_src_ptr; src_ptr += EnvelopeScaleFactor) {
 		const EnvelopeSample sub_sample = {
 			*min_element(src_ptr, src_ptr + EnvelopeScaleFactor),
 			*max_element(src_ptr, src_ptr + EnvelopeScaleFactor),
@@ -172,8 +170,7 @@ void AnalogSegment::append_payload_to_envelope_levels()
 	}
 
 	// Compute higher level mipmaps
-	for (unsigned int level = 1; level < ScaleStepCount; level++)
-	{
+	for (unsigned int level = 1; level < ScaleStepCount; level++) {
 		Envelope &e = envelope_levels_[level];
 		const Envelope &el = envelope_levels_[level-1];
 
@@ -192,14 +189,12 @@ void AnalogSegment::append_payload_to_envelope_levels()
 			el.samples + prev_length * EnvelopeScaleFactor;
 		const EnvelopeSample *const end_dest_ptr = e.samples + e.length;
 		for (dest_ptr = e.samples + prev_length;
-			dest_ptr < end_dest_ptr; dest_ptr++)
-		{
+				dest_ptr < end_dest_ptr; dest_ptr++) {
 			const EnvelopeSample *const end_src_ptr =
 				src_ptr + EnvelopeScaleFactor;
 
 			EnvelopeSample sub_sample = *src_ptr++;
-			while (src_ptr < end_src_ptr)
-			{
+			while (src_ptr < end_src_ptr) {
 				sub_sample.min = min(sub_sample.min, src_ptr->min);
 				sub_sample.max = max(sub_sample.max, src_ptr->max);
 				src_ptr++;