Merge remote-tracking branch 'cgal/5.4.x-branch'

Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/repair_degeneracies.h

@@ -833,6 +833,18 @@ bool remove_almost_degenerate_faces(const FaceRange& face_range,
       // special case of `edge(h, tmesh)` being a border edge --> remove the face
       if(is_border(opposite(h, tmesh), tmesh))
       {
+        // check a non-manifold vertex won't be created
+        bool removal_is_nm=false;
+        for(halfedge_descriptor hh : CGAL::halfedges_around_target(next(h, tmesh), tmesh))
+        {
+          if (is_border(hh, tmesh))
+          {
+            removal_is_nm = true;
+            break;
+          }
+        }
+        if (removal_is_nm) continue;
+
         for(halfedge_descriptor hh : CGAL::halfedges_around_face(h, tmesh))
         {
           // Remove from even 'next_edges_to_flip' because it might have been re-added from a flip

Surface_mesh_segmentation/include/CGAL/Surface_mesh_segmentation/internal/auxiliary/graph.h

@@ -520,6 +520,8 @@ public:
   /* Destructor */
   ~Graph();
 
+  void clear();
+
   /* Adds a node to the graph */
   node_id add_node();
 
@@ -701,7 +703,7 @@ inline Graph::Graph(void (*err_function)(const char *))
   flow = 0;
 }
 
-inline Graph::~Graph()
+inline void Graph::clear()
 {
   while (node_block_first) {
     node_block *next = node_block_first -> next;
@@ -722,6 +724,11 @@ inline Graph::~Graph()
   }
 }
 
+inline Graph::~Graph()
+{
+  clear();
+}
+
 inline Graph::node_id Graph::add_node()
 {
   node *i;

Surface_mesh_segmentation/include/CGAL/boost/graph/Alpha_expansion_MaxFlow_tag.h

@@ -47,7 +47,7 @@ public:
 
   void clear_graph()
   {
-    graph = MaxFlow::Graph();
+    graph.clear();
   }
 
   Vertex_descriptor add_vertex()