Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle nr newlines

Browse Source
This commit is contained in:
Jan Möbius
2016-05-30 16:12:38 +02:00
parent 91ee22ca2f
commit b4cea6008d
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Doc/changelog.docu
View File

@@ -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>
</ul> </ul>

4
src/OpenMesh/Core/IO/reader/PLYReader.cc
View File

@@ -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;