Commit 7f7d751e authored by Jan Möbius's avatar Jan Möbius

Merge branch 'PLYNewlineFix' into 'master'

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
parents d43d7d21 04fc8dac
Pipeline #881 passed with stage
......@@ -1275,7 +1275,19 @@ bool _PLYReader_::can_u_read(std::istream& _is) const {
// As the binary data is directy after the end_header keyword
// and the stream removes too many bytes, seek back to the right position
if (options_.is_binary()) {
_is.seekg(streamPos + 12);
_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);
}
}
return true;
......
Markdown is supported
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