diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Snapping/snap.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Snapping/snap.h index 6601dd0317a..393281d3da6 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Snapping/snap.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Snapping/snap.h @@ -1185,13 +1185,13 @@ std::size_t snap_borders(TriangleMesh& tm_A, { typedef typename boost::graph_traits::halfedge_descriptor halfedge_descriptor; - std::vector border_vertices_1; - border_halfedges(tm_A, std::back_inserter(border_vertices_1)); - std::vector border_vertices_2; - border_halfedges(tm_B, std::back_inserter(border_vertices_2)); + std::vector border_vertices_A; + border_halfedges(tm_A, std::back_inserter(border_vertices_A)); + std::vector border_vertices_B; + border_halfedges(tm_B, std::back_inserter(border_vertices_B)); - return internal::snap_non_conformal(border_vertices_1, tm_A, tolerance_map_A, - border_vertices_2, tm_B, tolerance_map_B, + return internal::snap_non_conformal(border_vertices_A, tm_A, tolerance_map_A, + border_vertices_B, tm_B, tolerance_map_B, false /*not self snapping*/, np_A, np_B); } @@ -1211,19 +1211,19 @@ std::size_t snap_borders(TriangleMesh& tm_A, typedef CGAL::dynamic_vertex_property_t Vertex_property_tag; typedef typename boost::property_map::type Tolerance_map; - std::vector border_vertices_1; - std::vector border_vertices_2; - border_halfedges(tm_A, std::back_inserter(border_vertices_1)); - border_halfedges(tm_B, std::back_inserter(border_vertices_2)); + std::vector border_vertices_A; + std::vector border_vertices_B; + border_halfedges(tm_A, std::back_inserter(border_vertices_A)); + border_halfedges(tm_B, std::back_inserter(border_vertices_B)); const FT tol_mx(std::numeric_limits::max()); Tolerance_map tolerance_map_A = get(Vertex_property_tag(), tm_A); - internal::assign_tolerance_with_local_edge_length_bound(border_vertices_1, tolerance_map_A, tol_mx, tm_A, np_A); - Tolerance_map tolerance_map_B = get(Vertex_property_tag(), tm_A); - internal::assign_tolerance_with_local_edge_length_bound(border_vertices_2, tolerance_map_B, tol_mx, tm_B, np_B); + internal::assign_tolerance_with_local_edge_length_bound(border_vertices_A, tolerance_map_A, tol_mx, tm_A, np_A); + Tolerance_map tolerance_map_B = get(Vertex_property_tag(), tm_B); + internal::assign_tolerance_with_local_edge_length_bound(border_vertices_B, tolerance_map_B, tol_mx, tm_B, np_B); - return internal::snap_non_conformal(border_vertices_1, tm_A, tolerance_map_A, - border_vertices_2, tm_B, tolerance_map_B, + return internal::snap_non_conformal(border_vertices_A, tm_A, tolerance_map_A, + border_vertices_B, tm_B, tolerance_map_B, false /*no self snapping*/, np_A, np_B); }