From b4cea6008d8cd8540095ec984a1c356d22e76f08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Mon, 30 May 2016 16:12:38 +0200 Subject: [PATCH] Handle nr newlines --- Doc/changelog.docu | 1 + src/OpenMesh/Core/IO/reader/PLYReader.cc | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/Doc/changelog.docu b/Doc/changelog.docu index cefdae14..adde062c 100644 --- a/Doc/changelog.docu +++ b/Doc/changelog.docu @@ -20,6 +20,7 @@ IO diff --git a/src/OpenMesh/Core/IO/reader/PLYReader.cc b/src/OpenMesh/Core/IO/reader/PLYReader.cc index ecfa83fe..df42756c 100644 --- a/src/OpenMesh/Core/IO/reader/PLYReader.cc +++ b/src/OpenMesh/Core/IO/reader/PLYReader.cc @@ -1076,6 +1076,10 @@ bool _PLYReader_::can_u_read(std::istream& _is) const { std::getline(_is, 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 if (line != "PLY" && line != "ply") return false;