X-Git-Url: http://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fmathsignal.hpp;fp=pv%2Fdata%2Fmathsignal.hpp;h=e40dbfb3cf61125643d945b2b760846f4069efee;hp=76427c56e73079a4757d9b468e32b947478bd0a7;hb=2823de2c821f01b9b6d8df7fc972e290518075ae;hpb=5a8f700cd1adfcfc316393969d11fba8173e9bbf

diff --git a/pv/data/mathsignal.hpp b/pv/data/mathsignal.hpp
index 76427c56..e40dbfb3 100644
--- a/pv/data/mathsignal.hpp
+++ b/pv/data/mathsignal.hpp
@@ -20,6 +20,10 @@
 #ifndef PULSEVIEW_PV_DATA_MATHSIGNAL_HPP
 #define PULSEVIEW_PV_DATA_MATHSIGNAL_HPP
 
+#define exprtk_disable_rtl_io_file /* Potential security issue, doubt anyone would use those anyway */
+#define exprtk_disable_rtl_vecops  /* Vector ops are rather useless for math channels */
+#define exprtk_disable_caseinsensitivity /* So that we can have both 't' and 'T' */
+
 #include <limits>
 
 #include <QString>
@@ -91,7 +95,7 @@ private:
 	void reset_generation();
 	virtual void begin_generation();
 
-	void generate_samples(uint32_t segment_id, const uint64_t start_sample,
+	uint64_t generate_samples(uint32_t segment_id, const uint64_t start_sample,
 		const int64_t sample_count);
 	void generation_proc();
 
@@ -122,6 +126,7 @@ private:
 	uint64_t custom_sample_rate_;
 	uint64_t custom_sample_count_;
 	bool use_custom_sample_rate_, use_custom_sample_count_;
+	uint64_t generation_chunk_size_;
 	map<std::string, signal_data> input_signals_;
 
 	QString expression_;