detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-19 16:27:13 +02:00
Code Issues Actions Packages Releases Activity

Merge branch 'moench' of https://github.com/slsdetectorgroup/slsDetectorPackage into moench

Browse Source
This commit is contained in:
bergamaschi
2020-03-19 11:16:10 +01:00
parent d551bac3f7 770ca7bb96
commit 14b572cdd9
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsReceiverSoftware/include/ZmqSocket.h
View File

@ -56,8 +56,10 @@ public:
(ConvertInternetAddresstoIpString(result, ip, MAX_STR_LENGTH))) (ConvertInternetAddresstoIpString(result, ip, MAX_STR_LENGTH)))
throw std::exception(); throw std::exception();
std::string sip(ip);
// construct address // construct address
sprintf (sockfd.serverAddress, "tcp://%s:%d", ip, portno); sprintf (sockfd.serverAddress, "tcp://%s:%d", sip.c_str(), portno);
#ifdef VERBOSE #ifdef VERBOSE
cprintf(BLUE,"address:%s\n",sockfd.serverAddress); cprintf(BLUE,"address:%s\n",sockfd.serverAddress);
#endif #endif

2
slsReceiverSoftware/src/DataProcessor.cpp
View File

@ -146,7 +146,7 @@ void DataProcessor::ResetParametersforNewMeasurement(){
delete [] tempBuffer; delete [] tempBuffer;
tempBuffer = 0; tempBuffer = 0;
} }
if (*gapPixelsEnable >= 0) { if (*gapPixelsEnable) {
tempBuffer = new char[generalData->imageSize]; tempBuffer = new char[generalData->imageSize];
memset(tempBuffer, 0, generalData->imageSize); memset(tempBuffer, 0, generalData->imageSize);
} }