Merge pull request #8483 from afabri/CGAL-Issue8399-GF

Cleanup as suggested in Issue 8399
This commit is contained in:
Sébastien Loriot 2024-10-21 19:15:29 +02:00
commit e21f49d79c
3 changed files with 7 additions and 8 deletions

View File

@ -59,9 +59,9 @@ bool write_3MF(const std::string& filename,
const GraphRange& gs, const GraphRange& gs,
const std::vector<std::string>& names const std::vector<std::string>& names
#ifndef DOXYGEN_RUNNING #ifndef DOXYGEN_RUNNING
, std::enable_if_t<! , std::enable_if_t<
internal::is_Point_set_or_Range_or_Iterator< ! internal::is_Point_set_or_Range_or_Iterator<
typename boost::range_value<GraphRange>::type>::value>* = nullptr typename boost::range_value<GraphRange>::type>::value>* = nullptr
#endif #endif
) )
{ {

View File

@ -133,8 +133,8 @@ normalized_border_is_valid( bool verb) const {
Halfedge_const_iterator e = hds->halfedges_begin(); Halfedge_const_iterator e = hds->halfedges_begin();
size_type count = 0; size_type count = 0;
while( e != hds->halfedges_end() && ! e->is_border() && ! while( e != hds->halfedges_end() && ! e->is_border() &&
e->opposite()->is_border()) { ! e->opposite()->is_border()) {
++e; ++e;
++e; ++e;
++count; ++count;

View File

@ -241,9 +241,8 @@ bool SM_io_parser<Decorator_>::read_edge(SHalfedge_handle e)
!(in >> m) || !check_sep(",") || !(in >> m) || !check_sep(",") ||
!(in >> k) || !check_sep("}") ) !(in >> k) || !check_sep("}") )
return false; return false;
if (! if (! (eo >= 0 && eo < en && epr >= 0 && epr < en && ene >= 0 && ene < en &&
(eo >= 0 && eo < en && epr >= 0 && epr < en && ene >= 0 && ene < en && v >= 0 && v < vn && f >= 0 && f < fn ))
v >= 0 && v < vn && f >= 0 && f < fn ))
{ {
std::cerr<<"wrong index in read_edge"<<std::endl; std::cerr<<"wrong index in read_edge"<<std::endl;
in.setstate(std::ios_base::badbit); in.setstate(std::ios_base::badbit);