Commit 984239ad authored by Jan Möbius's avatar Jan Möbius
Browse files

Merge branch 'PLY_READER_handle_rn_newlines' into 'master'

Handle nr newlines



See merge request !71
parents 2e5de79b b4cea600
Pipeline #2057 passed with stage
in 75 minutes and 22 seconds
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
<b>IO</b> <b>IO</b>
<ul> <ul>
<li>PLY Reader: Handle nr newlines (Thanks to Christian Feurer for the patch)</li>
<li>PLY Reader: Fixed binary reader errors in ply reader. (Thanks to Michael Kremer for the patch)</li> <li>PLY Reader: Fixed binary reader errors in ply reader. (Thanks to Michael Kremer for the patch)</li>
<li>Throw error when no readers are available (Thanks to Christian Feurer for the patch)</li> <li>Throw error when no readers are available (Thanks to Christian Feurer for the patch)</li>
</ul> </ul>
......
...@@ -1076,6 +1076,10 @@ bool _PLYReader_::can_u_read(std::istream& _is) const { ...@@ -1076,6 +1076,10 @@ bool _PLYReader_::can_u_read(std::istream& _is) const {
std::getline(_is, line); std::getline(_is, line);
trim(line); trim(line);
// Handle '\r\n' newlines
const int s = line.size();
if( s > 0 && line[s - 1] == '\r') line.resize(s - 1);
//Check if this file is really a ply format //Check if this file is really a ply format
if (line != "PLY" && line != "ply") if (line != "PLY" && line != "ply")
return false; return false;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment