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

Merge pull request #6054 from janetournois/Mesh_3-uninitialized_warnings-GF 

Mesh_3 - fix maybe uninitialized warning
This commit is contained in:
Laurent Rineau 2021-10-29 16:59:45 +02:00
parent 2cc8b86306 a9318b3832
commit aca24f489b
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h
View File

@ -1684,9 +1684,8 @@ private:
/**
* Returns the least square plane from v, using adjacent surface points
*/
boost::optional<Plane_3>
std::pair<boost::optional<Plane_3>, Bare_point>
get_least_square_surface_plane(const Vertex_handle& v,
Bare_point& ref_point,
Surface_patch_index index = Surface_patch_index()) const;
/**
@ -3414,10 +3413,10 @@ project_on_surface_aux(const Bare_point& p,
template <typename C3T3, typename MD>
boost::optional<typename C3T3_helpers<C3T3,MD>::Plane_3>
std::pair<boost::optional<typename C3T3_helpers<C3T3,MD>::Plane_3>,
typename C3T3_helpers<C3T3, MD>::Bare_point>
C3T3_helpers<C3T3,MD>::
get_least_square_surface_plane(const Vertex_handle& v,
Bare_point& reference_point,
Surface_patch_index patch_index) const
{
typedef typename C3T3::Triangulation::Triangle Triangle;
@ -3467,7 +3466,7 @@ get_least_square_surface_plane(const Vertex_handle& v,
// In some cases point is not a real surface point
if ( triangles.empty() )
return boost::none;
return std::make_pair(boost::none, Bare_point());
// Compute least square fitting plane
Plane_3 plane;
@ -3481,9 +3480,8 @@ get_least_square_surface_plane(const Vertex_handle& v,
tr_.geom_traits(),
Default_diagonalize_traits<FT, 3>());
reference_point = ref_facet.first->get_facet_surface_center(ref_facet.second);
return plane;
return std::make_pair(plane,
ref_facet.first->get_facet_surface_center(ref_facet.second));
}
@ -3515,9 +3513,10 @@ project_on_surface_if_possible(const Vertex_handle& v,
typename Gt::Equal_3 equal = tr_.geom_traits().equal_3_object();
// Get plane
Bare_point reference_point;
boost::optional<Plane_3> opt_plane = get_least_square_surface_plane(v, reference_point, index);
std::pair<boost::optional<Plane_3>, Bare_point> pl_rp
= get_least_square_surface_plane(v, index);
boost::optional<Plane_3> opt_plane = pl_rp.first;
if(!opt_plane) return boost::none;
// Project
@ -3525,8 +3524,11 @@ project_on_surface_if_possible(const Vertex_handle& v,
if ( ! equal(p, cp(position)) )
return project_on_surface_aux(p, cp(position), opt_plane->orthogonal_vector());
else
{
const Bare_point& reference_point = pl_rp.second;
return project_on_surface_aux(p, reference_point, opt_plane->orthogonal_vector());
}
}