detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-31 21:34:56 +01:00
Code Issues Actions Packages Releases Activity

rxr: removed char array memebers in rxrimplementation

Browse Source
This commit is contained in:
maliakal_d
2019-11-18 14:29:01 +01:00
parent 32cf46a8a3
commit f2c0ff7f98
23 changed files with 99 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsReceiverSoftware/include/DataStreamer.h
View File

@@ -35,7 +35,7 @@ class DataStreamer : private virtual slsDetectorDefs, public ThreadObject {
* @param qe pointer to quad Enable
*/
DataStreamer(int ind, Fifo* f, uint32_t* dr, ROI* r,
uint64_t* fi, int fd, char* ajh, int* nd, bool* gpEnable, bool* qe);
uint64_t* fi, int fd, std::string* ajh, int* nd, bool* gpEnable, bool* qe);
/**
* Destructor
@@ -197,7 +197,7 @@ class DataStreamer : private virtual slsDetectorDefs, public ThreadObject {
int flippedDataX;
/** additional json header */
char* additionJsonHeader;
std::string* additionJsonHeader;
/** Aquisition Started flag */
bool startedFlag;