- PLY Reader: Fix file load for ASCII PLY without a newline at the end of the file (Thanks to Mathieu Lamarre for the patch )
closes #64
This commit is contained in:
@@ -27,6 +27,7 @@
|
|||||||
<li>PLY Reader: Allowing the PLY reader to read custom face ( Thanks to morgan Leborgne for the patch)</li>
|
<li>PLY Reader: Allowing the PLY reader to read custom face ( Thanks to morgan Leborgne for the patch)</li>
|
||||||
<li>PLY Reader: Fixed endless loop on unknown property list type</li>
|
<li>PLY Reader: Fixed endless loop on unknown property list type</li>
|
||||||
<li>PLY Reader: Fix hang when reading directly from istream (Thanks to Paul Loré for the patch)</li>
|
<li>PLY Reader: Fix hang when reading directly from istream (Thanks to Paul Loré for the patch)</li>
|
||||||
|
<li>PLY Reader: Fix file load for ASCII PLY without a newline at the end of the file (Thanks to Mathieu Lamarre for the patch )
|
||||||
<li>OM Writer/Reader: Update file format version to 2.0. Older files can still be read, but older OpenMesh versions cannot read new format.</li>
|
<li>OM Writer/Reader: Update file format version to 2.0. Older files can still be read, but older OpenMesh versions cannot read new format.</li>
|
||||||
<li>OM Writer/Reader: Fixed inconsistent writing/reading of edge properties</li>
|
<li>OM Writer/Reader: Fixed inconsistent writing/reading of edge properties</li>
|
||||||
<li>OM Writer/Reader: Add option to store status</li>
|
<li>OM Writer/Reader: Add option to store status</li>
|
||||||
|
|||||||
@@ -306,6 +306,14 @@ bool _PLYReader_::read_ascii(std::istream& _in, BaseImporter& _bi, const Options
|
|||||||
|
|
||||||
for (std::vector<ElementInfo>::iterator e_it = elements_.begin(); e_it != elements_.end(); ++e_it)
|
for (std::vector<ElementInfo>::iterator e_it = elements_.begin(); e_it != elements_.end(); ++e_it)
|
||||||
{
|
{
|
||||||
|
if (_in.eof()) {
|
||||||
|
if (err_enabled)
|
||||||
|
omerr().enable();
|
||||||
|
|
||||||
|
omerr() << "Unexpected end of file while reading." << std::endl;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
if (e_it->element_== VERTEX)
|
if (e_it->element_== VERTEX)
|
||||||
{
|
{
|
||||||
// read vertices:
|
// read vertices:
|
||||||
@@ -475,14 +483,6 @@ bool _PLYReader_::read_ascii(std::istream& _in, BaseImporter& _bi, const Options
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_in.eof()) {
|
|
||||||
if (err_enabled)
|
|
||||||
omerr().enable();
|
|
||||||
|
|
||||||
omerr() << "Unexpected end of file while reading." << std::endl;
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(e_it->element_== FACE)
|
if(e_it->element_== FACE)
|
||||||
// stop reading after the faces since additional elements are not preserved anyway
|
// stop reading after the faces since additional elements are not preserved anyway
|
||||||
break;
|
break;
|
||||||
|
|||||||
Reference in New Issue
Block a user