From: Uwe Hermann <redacted>
Date: Tue, 20 Oct 2015 22:33:46 +0000 (+0200)
Subject: Minor update related to the libsigrok analog format changes.
X-Git-Tag: pulseview-0.3.0~62
X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=commitdiff_plain;h=475f4d08f3099a949dbac5f8b64cda36957ed103;ds=sidebyside

Minor update related to the libsigrok analog format changes.

This is only a temporary fix, and assumes only SR_DF_ANALOG packets with
float data ever arrive. Support for other types will be needed later.
---

diff --git a/pv/session.cpp b/pv/session.cpp
index 45c4e987..41300968 100644
--- a/pv/session.cpp
+++ b/pv/session.cpp
@@ -521,7 +521,7 @@ void Session::feed_in_analog(shared_ptr<Analog> analog)
 	const vector<shared_ptr<Channel>> channels = analog->channels();
 	const unsigned int channel_count = channels.size();
 	const size_t sample_count = analog->num_samples() / channel_count;
-	const float *data = analog->data_pointer();
+	const float *data = static_cast<const float *>(analog->data_pointer());
 	bool sweep_beginning = false;
 
 	for (auto channel : channels)