songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2265 from afabri/Surface_mesh_set_istream_failbit-GF 

Surface_mesh: Set the failbit instead of writing a warning message to std::cout
This commit is contained in:
Laurent Rineau 2017-07-21 10:45:41 +02:00
parent f8760d591b 99725e77a6
commit fefcaa1cdd
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Surface_mesh/include/CGAL/Surface_mesh/Surface_mesh.h
View File

@ -2045,6 +2045,8 @@ private: //------------------------------------------------------- private data
/// The operator reads the point property as well as "v:normal", "v:color", and "f:color".
/// Vertex texture coordinates are ignored.
/// \pre `operator>>(std::istream&,const P&)` must be defined.
/// \pre The data in the stream must represent a two-manifold. If this is not the case
/// the `failbit` of `is` is set and the mesh cleared.
template <typename P>
bool read_off(std::istream& is, Surface_mesh<P>& sm)
@ -2123,9 +2125,9 @@ private: //------------------------------------------------------- private data
Face_index fi = sm.add_face(vr);
if(fi == sm.null_face())
{
std::cout<< "Warning: Facets don't seem to be oriented. Loading a Soup of polygons instead."<<std::endl;
sm.clear();
return false;
is.setstate(std::ios::failbit);
sm.clear();
return false;
}
// the first face will tell us if faces have a color map