From f05a11dde52ed54659a8b689d06e8b04e17fc9a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mael=20Rouxel-Labb=C3=A9?= Date: Fri, 23 Aug 2019 11:15:41 +0200 Subject: [PATCH] Fix some internal functions not being in the 'internal' namespace --- .../CGAL/Polygon_mesh_processing/compute_normal.h | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/compute_normal.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/compute_normal.h index 747c0a6b184..27633df4f0f 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/compute_normal.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/compute_normal.h @@ -66,8 +66,6 @@ triangle_normal(const Point& p0, const Point& p1, const Point& p2, const GT& tra return traits.construct_scaled_vector_3_object()(n, 0.5); } -} // namespace internal - template void sum_normals(const PM& pmesh, typename boost::graph_traits::face_descriptor f, @@ -93,6 +91,8 @@ void sum_normals(const PM& pmesh, } } +} // namespace internal + /** * \ingroup PMP_normal_grp * computes the outward unit vector normal to face `f`. @@ -143,7 +143,7 @@ compute_face_normal(typename boost::graph_traits::face_descriptor f typedef typename GT::Vector_3 Vector; Vector normal = traits.construct_vector_3_object()(CGAL::NULL_VECTOR); - sum_normals(pmesh, f, vpmap, normal, traits); + internal::sum_normals(pmesh, f, vpmap, normal, traits); if(!traits.equal_3_object()(normal, CGAL::NULL_VECTOR)) internal::normalize(normal, traits); @@ -202,6 +202,8 @@ void compute_face_normals(const PolygonMesh& pmesh, FaceNormalMap fnm) compute_face_normals(pmesh, fnm, CGAL::Polygon_mesh_processing::parameters::all_default()); } +namespace internal { + template bool almost_equal(const typename GT::Vector_3& v1, const typename GT::Vector_3& v2) { @@ -466,12 +468,7 @@ void compute_most_visible_vertex_normals(VertexNormalMap& vertex_normal_map, } } -template -void compute_most_visible_vertex_normals(VertexNormalMap& vertex_normal_map, - const PolygonMesh& pmesh) -{ - return compute_most_visible_vertex_normals(vertex_normal_map, pmesh, CGAL::parameters::all_default()); -} +} // end namespace internal /** * \ingroup PMP_normal_grp