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

Merge branch '5.2.x-branch' into 5.3.x-branch

This commit is contained in:
Laurent Rineau 2021-10-07 14:26:14 +02:00
parent 3755c25d18 c8eda9deca
commit 0e3b73852f
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Heat_method_3/include/CGAL/Heat_method_3/Surface_mesh_geodesic_distances_3.h
View File

@ -110,7 +110,7 @@ public:
\brief Constructor \brief Constructor
*/ */
Surface_mesh_geodesic_distances_3(const TriangleMesh& tm, VertexPointMap vpm) Surface_mesh_geodesic_distances_3(const TriangleMesh& tm, VertexPointMap vpm)
: v2v(tm), tm(tm), vpm(vpm) : vertex_id_map(get(Vertex_property_tag(),tm)), face_id_map(get(Face_property_tag(),tm)), v2v(tm), tm(tm), vpm(vpm)
{ {
build(); build();
} }
@ -802,14 +802,14 @@ class Surface_mesh_geodesic_distances_3
>::Kernel >::Kernel
>::type, >::type,
Mode, Mode,
#ifdef CGAL_EIGEN3_ENABLED #ifdef CGAL_EIGEN3_ENABLED
typename Default::Get< typename Default::Get<
LA, LA,
Eigen_solver_traits<Eigen::SimplicialLDLT<typename Eigen_sparse_matrix<double>::EigenType > > Eigen_solver_traits<Eigen::SimplicialLDLT<typename Eigen_sparse_matrix<double>::EigenType > >
>::type, >::type,
#else #else
LA, LA,
#endif #endif
typename Default::Get< typename Default::Get<
VertexPointMap, VertexPointMap,
typename boost::property_map< TriangleMesh, vertex_point_t>::const_type typename boost::property_map< TriangleMesh, vertex_point_t>::const_type
@ -817,15 +817,18 @@ class Surface_mesh_geodesic_distances_3
> >
#endif #endif
{ {
CGAL_static_assertion((std::is_same<Mode, Direct>::value) ||
(std::is_same<Mode, Intrinsic_Delaunay>::value));
// extract real types from Default // extract real types from Default
#ifdef CGAL_EIGEN3_ENABLED #ifdef CGAL_EIGEN3_ENABLED
typedef typename Default::Get< typedef typename Default::Get<
LA, LA,
Eigen_solver_traits<Eigen::SimplicialLDLT<typename Eigen_sparse_matrix<double>::EigenType > > Eigen_solver_traits<Eigen::SimplicialLDLT<typename Eigen_sparse_matrix<double>::EigenType > >
>::type LA_type; >::type LA_type;
#else #else
typedef LA LA_type; typedef LA LA_type;
#endif #endif
typedef typename Default::Get< typedef typename Default::Get<
VertexPointMap, VertexPointMap,

8
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/clip.h
View File

@ -45,9 +45,7 @@
namespace CGAL{ namespace CGAL{
namespace Polygon_mesh_processing { namespace Polygon_mesh_processing {
namespace internal {
namespace internal
{
template <class Plane_3, template <class Plane_3,
class TriangleMesh, class TriangleMesh,
@ -446,8 +444,8 @@ generic_clip_impl(
Vpm vpm1 = choose_parameter(get_parameter(np1, internal_np::vertex_point), Vpm vpm1 = choose_parameter(get_parameter(np1, internal_np::vertex_point),
get_property_map(boost::vertex_point, tm1)); get_property_map(boost::vertex_point, tm1));
Vpm vpm2 = choose_parameter(get_parameter(np2, internal_np::vertex_point), Vpm2 vpm2 = choose_parameter(get_parameter(np2, internal_np::vertex_point),
get_property_map(boost::vertex_point, tm2)); get_property_map(boost::vertex_point, tm2));
if (&tm1==&tm2) if (&tm1==&tm2)
{ {

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

@ -326,7 +326,7 @@ std::size_t number_of_connected_components(const PolygonMesh& pmesh,
const CGAL_PMP_NP_CLASS& np) const CGAL_PMP_NP_CLASS& np)
{ {
typedef typename boost::graph_traits<PolygonMesh>::faces_size_type faces_size_type; typedef typename boost::graph_traits<PolygonMesh>::faces_size_type faces_size_type;
typedef CGAL::dynamic_face_property_t<faces_size_type> Face_property_tag; typedef CGAL::dynamic_face_property_t<faces_size_type> Face_property_tag;
typedef typename boost::property_map<PolygonMesh, Face_property_tag >::const_type Patch_ids_map; typedef typename boost::property_map<PolygonMesh, Face_property_tag >::const_type Patch_ids_map;
Patch_ids_map patch_ids_map = get(Face_property_tag(), pmesh); Patch_ids_map patch_ids_map = get(Face_property_tag(), pmesh);

1
Surface_mesh/include/CGAL/boost/graph/graph_traits_Surface_mesh.h
View File

@ -493,7 +493,6 @@ void
remove_face(typename boost::graph_traits<CGAL::Surface_mesh<P> >::face_descriptor f, remove_face(typename boost::graph_traits<CGAL::Surface_mesh<P> >::face_descriptor f,
CGAL::Surface_mesh<P>& sm) CGAL::Surface_mesh<P>& sm)
{ {
sm.remove_face(f); sm.remove_face(f);
} }