From 56dfa3aa4a8d8005d54138072f4e5ff20b24f669 Mon Sep 17 00:00:00 2001 From: Sven Oesau Date: Wed, 13 Dec 2023 21:30:09 +0100 Subject: [PATCH] bug fix --- Kinetic_space_partition/include/CGAL/KSP/debug.h | 4 ++-- Kinetic_space_partition/include/CGAL/KSP_3/Data_structure.h | 4 ++-- Kinetic_space_partition/include/CGAL/KSP_3/FacePropagation.h | 2 +- Kinetic_space_partition/include/CGAL/KSP_3/Finalizer.h | 2 +- Kinetic_space_partition/include/CGAL/KSP_3/Support_plane.h | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Kinetic_space_partition/include/CGAL/KSP/debug.h b/Kinetic_space_partition/include/CGAL/KSP/debug.h index 89b0d75738c..03e3425f675 100644 --- a/Kinetic_space_partition/include/CGAL/KSP/debug.h +++ b/Kinetic_space_partition/include/CGAL/KSP/debug.h @@ -73,7 +73,7 @@ void dump_segmented_edges(const DS& data, const std::string tag = std::string()) } for (const auto iedge : data.iedges()) { - CGAL_assertion(data.line_idx(iedge) != KSP::no_element()); + CGAL_assertion(data.line_idx(iedge) != std::size_t(-1)); *(out[data.line_idx(iedge)]) << "2 " << data.segment_3(iedge) << std::endl; } @@ -1182,7 +1182,7 @@ void dump_cdt( const auto face = mesh.add_face(vertices); CGAL::Random rand(fit->info().index); - if (fit->info().index != KSP::no_element()) { + if (fit->info().index != std::size_t(-1)) { red[face] = (unsigned char)(rand.get_int(32, 192)); green[face] = (unsigned char)(rand.get_int(32, 192)); blue[face] = (unsigned char)(rand.get_int(32, 192)); diff --git a/Kinetic_space_partition/include/CGAL/KSP_3/Data_structure.h b/Kinetic_space_partition/include/CGAL/KSP_3/Data_structure.h index 658f801ff20..d01bbfe9112 100644 --- a/Kinetic_space_partition/include/CGAL/KSP_3/Data_structure.h +++ b/Kinetic_space_partition/include/CGAL/KSP_3/Data_structure.h @@ -40,8 +40,8 @@ public: using Kernel = GeomTraits; using Intersection_kernel = IntersectionKernel; - using Support_plane = Support_plane; - using Intersection_graph = Intersection_graph; + using Support_plane = CGAL::KSP_3::internal::Support_plane; + using Intersection_graph = CGAL::KSP_3::internal::Intersection_graph; using Face_event = typename Support_plane::Face_event; using FT = typename Kernel::FT; diff --git a/Kinetic_space_partition/include/CGAL/KSP_3/FacePropagation.h b/Kinetic_space_partition/include/CGAL/KSP_3/FacePropagation.h index e59f6594b7f..4fc6fe910ad 100644 --- a/Kinetic_space_partition/include/CGAL/KSP_3/FacePropagation.h +++ b/Kinetic_space_partition/include/CGAL/KSP_3/FacePropagation.h @@ -44,7 +44,7 @@ private: using Direction_2 = typename Kernel::Direction_2; using Line_2 = typename Kernel::Line_2; - using Data_structure = Data_structure; + using Data_structure = CGAL::KSP_3::internal::Data_structure; using IVertex = typename Data_structure::IVertex; using IEdge = typename Data_structure::IEdge; diff --git a/Kinetic_space_partition/include/CGAL/KSP_3/Finalizer.h b/Kinetic_space_partition/include/CGAL/KSP_3/Finalizer.h index d8dcea9076f..b204c4fdccc 100644 --- a/Kinetic_space_partition/include/CGAL/KSP_3/Finalizer.h +++ b/Kinetic_space_partition/include/CGAL/KSP_3/Finalizer.h @@ -51,7 +51,7 @@ private: using From_exact = CGAL::Cartesian_converter; - using Data_structure = Data_structure; + using Data_structure = CGAL::KSP_3::internal::Data_structure; using IVertex = typename Data_structure::IVertex; using IEdge = typename Data_structure::IEdge; diff --git a/Kinetic_space_partition/include/CGAL/KSP_3/Support_plane.h b/Kinetic_space_partition/include/CGAL/KSP_3/Support_plane.h index cae6c1ceecb..0681e13451e 100644 --- a/Kinetic_space_partition/include/CGAL/KSP_3/Support_plane.h +++ b/Kinetic_space_partition/include/CGAL/KSP_3/Support_plane.h @@ -53,7 +53,7 @@ public: using Triangle_2 = typename Kernel::Triangle_2; using Mesh = CGAL::Surface_mesh; - using Intersection_graph = Intersection_graph; + using Intersection_graph = CGAL::KSP_3::internal::Intersection_graph; using Bbox_2 = CGAL::Bbox_2; using IVertex = typename Intersection_graph::Vertex_descriptor; @@ -218,7 +218,7 @@ public: CGAL_assertion(n != 0); m_data->k = 0; - m_data->plane = Plane_3(points[0], KSP::normalize(normal)); + m_data->plane = Plane_3(points[0], KSP::internal::normalize(normal)); m_data->exact_plane = to_exact(m_data->plane); m_data->is_bbox = is_bbox; m_data->distance_tolerance = 0;