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

merge ocnflict for white background

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-11-28 11:29:15 +01:00
parent 4466213882 a351fa8f28
commit a89847538d
17 changed files with 101 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slsReceiverSoftware/src/BinaryFile.cpp
View File

@ -78,7 +78,7 @@ int BinaryFile::WriteToFile(char* buffer, int buffersize, uint64_t fnum, uint32_
numActualPacketsInFile += nump;
if (BinaryFileStatic::WriteDataFile(filefd, buffer, buffersize, fnum) == buffersize)
return OK;
bprintf(RED,"%d Error: Write to file failed for image number %lld\n", index, (long long int)fnum);
cprintf(RED,"%d Error: Write to file failed for image number %lld\n", index, (long long int)fnum);
return FAIL;
}