Skip to content

Commit 071b277

Browse files
committed
Apply line-ending fix from @aylakhan. Closes #1169
1 parent b4b57e9 commit 071b277

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/Core/Algorithms/Legacy/DataIO/VTKToTriSurfReader.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ class VTKToTriSurfReaderPrivate
134134
{
135135
std::string line;
136136
std::getline(this->fileStream_, line, '\n');
137-
while ( (! this->fileStream_.eof()) && ( (line.size() < 1) || (line[0] == '#') ) )
137+
while ( (! this->fileStream_.eof()) && ( (line.size() < 1) || (line[0] == '#') || (line[0] == '\r') ) )
138138
std::getline(this->fileStream_, line, '\n');
139139

140140
return line;
@@ -498,7 +498,7 @@ VTKToTriSurfReaderPrivate::readFile(const std::string& vtk_filename, FieldHandle
498498

499499
// part 1: header
500500
std::getline(this->fileStream_, line, '\n');
501-
boost::char_separator<char> sep(" \t");
501+
boost::char_separator<char> sep(" \t\r");
502502
boost::tokenizer< boost::char_separator<char> > tokens(line, sep);
503503
BOOST_FOREACH(std::string t, tokens)
504504
{

0 commit comments

Comments
 (0)