Merge pull request #6030 from MaelRL/CGAL-Minor_fixes-GF

Fix uninitialized id maps in heat method

Heat_method_3/include/CGAL/Heat_method_3/Surface_mesh_geodesic_distances_3.h

@@ -110,7 +110,7 @@ public:
     \brief Constructor
   */
   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();
   }
@@ -805,14 +805,14 @@ class Surface_mesh_geodesic_distances_3
         >::Kernel
       >::type,
       Mode,
-      #ifdef CGAL_EIGEN3_ENABLED
+#ifdef CGAL_EIGEN3_ENABLED
       typename Default::Get<
         LA,
         Eigen_solver_traits<Eigen::SimplicialLDLT<typename Eigen_sparse_matrix<double>::EigenType > >
       >::type,
-      #else
+#else
       LA,
-      #endif
+#endif
       typename Default::Get<
         VertexPointMap,
         typename boost::property_map< TriangleMesh, vertex_point_t>::const_type
@@ -820,15 +820,18 @@ class Surface_mesh_geodesic_distances_3
     >
 #endif
 {
+  CGAL_static_assertion((std::is_same<Mode, Direct>::value) ||
+                        (std::is_same<Mode, Intrinsic_Delaunay>::value));
+
   // extract real types from Default
-  #ifdef CGAL_EIGEN3_ENABLED
+#ifdef CGAL_EIGEN3_ENABLED
   typedef typename Default::Get<
     LA,
     Eigen_solver_traits<Eigen::SimplicialLDLT<typename Eigen_sparse_matrix<double>::EigenType > >
   >::type LA_type;
-  #else
+#else
   typedef LA LA_type;
-  #endif
+#endif
 
   typedef typename Default::Get<
     VertexPointMap,

Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/clip.h

@@ -45,9 +45,7 @@
 
 namespace CGAL{
 namespace Polygon_mesh_processing {
-
-namespace internal
-{
+namespace internal {
 
 template <class Plane_3,
           class TriangleMesh,
@@ -446,7 +444,7 @@ generic_clip_impl(
   Vpm vpm1 = choose_parameter(get_parameter(np1, internal_np::vertex_point),
                               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));
 
   if (&tm1==&tm2)

Surface_mesh/include/CGAL/boost/graph/graph_traits_Surface_mesh.h

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