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

Merge pull request #3445 from sloriot/PMP-coref_vpm_fixes 

Use correct vpm
This commit is contained in:
Sebastien Loriot 2018-11-12 09:54:09 +01:00 committed by GitHub
parent a2f2d42a13 65f386b7a3
commit 6dc70d23cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Corefinement/Face_graph_output_builder.h
View File

@ -349,8 +349,8 @@ public:
, desired_output(desired_output)
, is_tm1_closed( is_closed(tm1))
, is_tm2_closed( is_closed(tm2))
, is_tm1_inside_out( is_tm1_closed && !PMP::is_outward_oriented(tm1) )
, is_tm2_inside_out( is_tm2_closed && !PMP::is_outward_oriented(tm2) )
, is_tm1_inside_out( is_tm1_closed && !PMP::is_outward_oriented(tm1, parameters::vertex_point_map(vpm1)) )
, is_tm2_inside_out( is_tm2_closed && !PMP::is_outward_oriented(tm2, parameters::vertex_point_map(vpm2)) )
, NID((std::numeric_limits<Node_id>::max)())
, mesh_to_intersection_edges(tm1, tm2)
{}

2
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/orientation.h
View File

@ -77,7 +77,7 @@ namespace internal{
//VertexPointMap
typedef typename GetVertexPointMap<PolygonMesh, NamedParameters>::const_type VPMap;
VPMap vpmap = choose_param(get_param(np, vertex_point),
VPMap vpmap = choose_param(get_param(np, internal_np::vertex_point),
get_const_property_map(vertex_point, pmesh));
//Kernel
typedef typename GetGeomTraits<PolygonMesh, NamedParameters>::type GT;