BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert API/ABI change for Context::create_analog_packet(). 

This is fine in libsigrokcxx mainline, but for the 0.5.x series we need
to remain API/ABI-compatible.
This commit is contained in:
Uwe Hermann 2018-10-14 20:18:40 +02:00
parent 8cd15dd4ce
commit d2af13d03f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bindings/cxx/classes.cpp
View File

@ -332,7 +332,7 @@ shared_ptr<Packet> Context::create_logic_packet(
shared_ptr<Packet> Context::create_analog_packet( shared_ptr<Packet> Context::create_analog_packet(
vector<shared_ptr<Channel> > channels, vector<shared_ptr<Channel> > channels,
const float *data_pointer, unsigned int num_samples, const Quantity *mq, float *data_pointer, unsigned int num_samples, const Quantity *mq,
const Unit *unit, vector<const QuantityFlag *> mqflags) const Unit *unit, vector<const QuantityFlag *> mqflags)
{ {
auto analog = g_new0(struct sr_datafeed_analog, 1); auto analog = g_new0(struct sr_datafeed_analog, 1);
@ -370,7 +370,7 @@ shared_ptr<Packet> Context::create_analog_packet(
spec->spec_digits = 0; spec->spec_digits = 0;
analog->num_samples = num_samples; analog->num_samples = num_samples;
analog->data = (float*)data_pointer; analog->data = data_pointer;
auto packet = g_new(struct sr_datafeed_packet, 1); auto packet = g_new(struct sr_datafeed_packet, 1);
packet->type = SR_DF_ANALOG; packet->type = SR_DF_ANALOG;
packet->payload = analog; packet->payload = analog;

2
bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp
View File

@ -285,7 +285,7 @@ public:
/** Create an analog packet. */ /** Create an analog packet. */
shared_ptr<Packet> create_analog_packet( shared_ptr<Packet> create_analog_packet(
vector<shared_ptr<Channel> > channels, vector<shared_ptr<Channel> > channels,
const float *data_pointer, unsigned int num_samples, const Quantity *mq, float *data_pointer, unsigned int num_samples, const Quantity *mq,
const Unit *unit, vector<const QuantityFlag *> mqflags); const Unit *unit, vector<const QuantityFlag *> mqflags);
/** Load a saved session. /** Load a saved session.
* @param filename File name string. */ * @param filename File name string. */