Provide a fix for distance.h

afabri · Jan 31, 2024 · 5b187bd · 5b187bd
1 parent 7d7b080
commit 5b187bd
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/distance.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/distance.h
@@ -1449,6 +1449,8 @@ bounded_error_squared_Hausdorff_distance_impl(const TriangleMesh1& tm1,
   using Point_3 = typename Kernel::Point_3;
   using Triangle_3 = typename Kernel::Triangle_3;
 
+  auto midpoint = Kernel().construct_midpoint_3_object();
+
 #ifdef CGAL_HAUSDORFF_DEBUG
   std::cout << " -- Bounded Hausdorff --" << std::endl;
   std::cout << "error bound: " << error_bound << std::endl;
@@ -1645,9 +1647,9 @@ bounded_error_squared_Hausdorff_distance_impl(const TriangleMesh1& tm1,
     }
 
     // Subdivide the triangle into four smaller triangles.
-    const Point_3 v01 = CGAL::midpoint(v0, v1);
-    const Point_3 v02 = CGAL::midpoint(v0, v2);
-    const Point_3 v12 = CGAL::midpoint(v1, v2);
+    const Point_3 v01 = midpoint(v0, v1);
+    const Point_3 v02 = midpoint(v0, v2);
+    const Point_3 v12 = midpoint(v1, v2);
     const std::array<Triangle_3, 4> sub_triangles = { Triangle_3(v0, v01, v02), Triangle_3(v1 , v01, v12),
                                                       Triangle_3(v2, v02, v12), Triangle_3(v01, v02, v12) };
 
@@ -2372,17 +2374,19 @@ typename Kernel::FT recursive_hausdorff_subdivision(const typename Kernel::Point
   using FT = typename Kernel::FT;
   using Point_3 = typename Kernel::Point_3;
 
+  auto midpoint = Kernel().construct_midpoint_3_object();
+  auto squared_distance = Kernel().compute_squared_distance_3_object();
   // If all edge lengths of the triangle are below the error bound,
   // return the maximum of the distances of the three points to TM2 (via TM2_tree).
-  const FT max_squared_edge_length = (CGAL::max)((CGAL::max)(CGAL::squared_distance(p0, p1),
-                                                             CGAL::squared_distance(p0, p2)),
-                                                             CGAL::squared_distance(p1, p2));
+  const FT max_squared_edge_length = (CGAL::max)((CGAL::max)(squared_distance(p0, p1),
+                                                             squared_distance(p0, p2)),
+                                                             squared_distance(p1, p2));
 
   if(max_squared_edge_length < sq_error_bound)
   {
-    return (CGAL::max)((CGAL::max)(CGAL::squared_distance(p0, tm2_tree.closest_point(p0)),
-                                   CGAL::squared_distance(p1, tm2_tree.closest_point(p1))),
-                                   CGAL::squared_distance(p2, tm2_tree.closest_point(p2)));
+    return (CGAL::max)((CGAL::max)(squared_distance(p0, tm2_tree.closest_point(p0)),
+                                   squared_distance(p1, tm2_tree.closest_point(p1))),
+                                   squared_distance(p2, tm2_tree.closest_point(p2)));
   }
 
   // Else subdivide the triangle and proceed recursively.