LMU/musrfit
LMU/musrfit
5
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases 3 Activity

Fix of the auto-header generation in msr2data for DOS-formatted output files

Browse Source
This commit is contained in:
Bastian M. Wojek 2011-02-05 18:32:12 +00:00
parent bd9c562eb9
commit 4a3ccab3e9
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/classes/PMsr2Data.cpp
View File

@ -51,12 +51,6 @@ using namespace boost::algorithm;
#include "PMsr2Data.h" #include "PMsr2Data.h"
// determine the length of the linebreak string for different systems ('\r' (old) Macintosh, '\n' Unix, "\r\n" DOS)
#if defined(__MSDOS__) || defined(_MSC_VER)
#define INCR 2
#else
#define INCR 1
#endif /* __MSDOS__ || _MSC_VER */
//------------------------------------------------------------- //-------------------------------------------------------------
/** /**
@ -1961,11 +1955,11 @@ int PMsr2Data::WriteOutput(const string &outfile, bool db, unsigned int withHead
int size(outFile.tellg()); int size(outFile.tellg());
string s; string s;
for (int i(INCR); i<=size; i+=INCR) { // find the last non-empty line for (int i(1); i<=size; ++i) { // find the last non-empty line
outFile.seekg(-i, ios::end); outFile.seekg(-i, ios::end);
getline(outFile, s); getline(outFile, s);
trim(s); // remove whitespace trim(s); // remove whitespace
if (s.empty()) { if (s.empty() || (s == "\n")) { // (s == "\n") check is for M$-systems using "\r\n" linebreaks
if (i == size) { if (i == size) {
outFile.seekp(0); outFile.seekp(0);
fHeaderWritten = false; // if the file contained only empty lines, default to writing the header fHeaderWritten = false; // if the file contained only empty lines, default to writing the header