Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
OpenMesh
OpenMesh
Commits
984239ad
Commit
984239ad
authored
May 30, 2016
by
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
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Doc/changelog.docu
View file @
984239ad
...
...
@@ -20,6 +20,7 @@
<b>IO</b>
<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>Throw error when no readers are available (Thanks to Christian Feurer for the patch)</li>
</ul>
...
...
src/OpenMesh/Core/IO/reader/PLYReader.cc
View file @
984239ad
...
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment