X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fstoresession.cpp;h=50815c26dcedfcaff7716f115b2eb376c371960a;hp=a5850060ec284e02c6ec1c4d0f2673c612d67b32;hb=2601ce965fc455d23f5a964b84ddd74eb93705c4;hpb=870ea3dbf35b182e120c5d84ab89bf9cb7691232

diff --git a/pv/storesession.cpp b/pv/storesession.cpp
index a5850060..50815c26 100644
--- a/pv/storesession.cpp
+++ b/pv/storesession.cpp
@@ -19,22 +19,16 @@
 
 #include <cassert>
 
-#ifdef _WIN32
-// Windows: Avoid boost/thread namespace pollution (which includes windows.h).
-#define NOGDI
-#define NORESOURCE
-#endif
-
 #include "storesession.hpp"
 
-#include <pv/devicemanager.hpp>
-#include <pv/session.hpp>
 #include <pv/data/analog.hpp>
 #include <pv/data/analogsegment.hpp>
 #include <pv/data/logic.hpp>
 #include <pv/data/logicsegment.hpp>
 #include <pv/data/signalbase.hpp>
+#include <pv/devicemanager.hpp>
 #include <pv/devices/device.hpp>
+#include <pv/session.hpp>
 
 #include <libsigrokcxx/libsigrokcxx.hpp>
 
@@ -246,8 +240,8 @@ void StoreSession::store_proc(vector< shared_ptr<data::SignalBase> > achannel_li
 				shared_ptr<sigrok::Channel> achannel = (achannel_list.at(i))->channel();
 				shared_ptr<data::AnalogSegment> asegment = asegment_list.at(i);
 
-				const float *adata =
-					asegment->get_samples(start_sample_, start_sample_ + packet_len);
+				float *adata = new float[packet_len];
+				asegment->get_samples(start_sample_, start_sample_ + packet_len, adata);
 
 				auto analog = context->create_analog_packet(
 					vector<shared_ptr<sigrok::Channel> >{achannel},
@@ -263,11 +257,11 @@ void StoreSession::store_proc(vector< shared_ptr<data::SignalBase> > achannel_li
 			}
 
 			if (lsegment) {
-				const uint8_t* ldata =
-					lsegment->get_samples(start_sample_, start_sample_ + packet_len);
+				const size_t data_size = packet_len * lunit_size;
+				uint8_t* ldata = new uint8_t[data_size];
+				lsegment->get_samples(start_sample_, start_sample_ + packet_len, ldata);
 
-				const size_t length = packet_len * lunit_size;
-				auto logic = context->create_logic_packet((void*)ldata, length, lunit_size);
+				auto logic = context->create_logic_packet((void*)ldata, data_size, lunit_size);
 				const string ldata_str = output_->receive(logic);
 
 				if (output_stream_.is_open())