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

Merge branch 'PLYNewlineFix' into 'master'

Browse Source 
Fixed CR LF newline handling for binary file headers.

The PLYReader did not handle CR LF newlines correctly, which caused it to read the vertex data 2 bytes too early.

See merge request !48
This commit is contained in:
Jan Möbius
2016-02-12 12:00:04 +01:00
parent d43d7d2148 04fc8dac85
commit 7f7d751ef5
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1275,8 +1275,20 @@ bool _PLYReader_::can_u_read(std::istream& _is) const {
// As the binary data is directy after the end_header keyword // As the binary data is directy after the end_header keyword
// and the stream removes too many bytes, seek back to the right position // and the stream removes too many bytes, seek back to the right position
if (options_.is_binary()) { if (options_.is_binary()) {
_is.seekg(streamPos);
char c1 = 0;
char c2 = 0;
_is.get(c1);
_is.get(c2);
if (c1 == 0x0D && c2 == 0x0A) {
_is.seekg(streamPos + 14);
}
else {
_is.seekg(streamPos + 12); _is.seekg(streamPos + 12);
} }
}
return true; return true;
} }