Skip to content

Commit 0f8e1fc

Browse files
sloriotsloriot
committed
start adding checks
1 parent a896d30 commit 0f8e1fc

File tree

6 files changed

+54
-8
lines changed

6 files changed

+54
-8
lines changed

‎Convex_hull_3/include/CGAL/convex_hull_3.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1064,6 +1064,8 @@ void convex_hull_3(const VertexListGraph& g,
10641064
PolygonMesh& pm,
10651065
const NamedParameters& np = parameters::default_values())
10661066
{
1067+
CGAL_CHECK_AUTHORIZED_NAMED_PARAMETERS(np, vertex_point_t);
1068+
10671069
using CGAL::parameters::choose_parameter;
10681070
using CGAL::parameters::get_parameter;
10691071

‎Kinetic_space_partition/include/CGAL/Kinetic_space_partition_3.h‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,10 @@ class Kinetic_space_partition_3 {
279279
m_parameters(
280280
parameters::choose_parameter(parameters::get_parameter(np, internal_np::verbose), false),
281281
parameters::choose_parameter(parameters::get_parameter(np, internal_np::debug), false)), // use true here to export all steps
282-
m_input2regularized() {}
282+
m_input2regularized()
283+
{
284+
CGAL_CHECK_AUTHORIZED_NAMED_PARAMETERS(np, verbose_t, debug_t);
285+
}
283286

284287
/*!
285288
\brief constructs a kinetic space partition object and initializes it.
@@ -355,7 +358,11 @@ class Kinetic_space_partition_3 {
355358
m_parameters(
356359
parameters::choose_parameter(parameters::get_parameter(np, internal_np::verbose), false),
357360
parameters::choose_parameter(parameters::get_parameter(np, internal_np::debug), false)), // use true here to export all steps
358-
m_input2regularized() {
361+
m_input2regularized()
362+
{
363+
CGAL_CHECK_AUTHORIZED_NAMED_PARAMETERS(np, point_t, debug_t, verbose_t, reorient_bbox_t,
364+
bbox_dilation_ratio_t, max_octree_depth_t, max_octree_node_size_t);
365+
359366
insert(points, polygons, np);
360367
initialize(np);
361368
}
@@ -393,7 +400,9 @@ class Kinetic_space_partition_3 {
393400
void insert(
394401
const PointRange& points,
395402
const PolygonRange& polygons,
396-
const NamedParameters& np = CGAL::parameters::default_values()) {
403+
const NamedParameters& np = CGAL::parameters::default_values())
404+
{
405+
CGAL_CHECK_AUTHORIZED_NAMED_PARAMETERS(np, point_t);
397406

398407
using NP_helper = Point_set_processing_3_np_helper<PointRange, NamedParameters>;
399408
using PointMap = typename NP_helper::Point_map;
@@ -480,7 +489,10 @@ class Kinetic_space_partition_3 {
480489
template<
481490
typename NamedParameters = parameters::Default_named_parameters>
482491
void initialize(
483-
const NamedParameters& np = CGAL::parameters::default_values()) {
492+
const NamedParameters& np = CGAL::parameters::default_values())
493+
{
494+
CGAL_CHECK_AUTHORIZED_NAMED_PARAMETERS(np, reorient_bbox_t, bbox_dilation_ratio_t, max_octree_depth_t, max_octree_node_size_t);
495+
484496
Timer timer;
485497
m_parameters.bbox_dilation_ratio = parameters::choose_parameter(
486498
parameters::get_parameter(np, internal_np::bbox_dilation_ratio), FT(11) / FT(10));

‎Kinetic_surface_reconstruction/include/CGAL/Kinetic_surface_reconstruction_3.h‎

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,10 @@ class Kinetic_surface_reconstruction_3 {
9191
*/
9292
template<typename NamedParameters = parameters::Default_named_parameters>
9393
Kinetic_surface_reconstruction_3(Point_range& points,
94-
const NamedParameters& np = CGAL::parameters::default_values()) : m_points(points), m_ground_polygon_index(-1), m_kinetic_partition(np) {
94+
const NamedParameters& np = CGAL::parameters::default_values()) : m_points(points), m_ground_polygon_index(-1), m_kinetic_partition(np)
95+
{
96+
CGAL_CHECK_AUTHORIZED_NAMED_PARAMETERS(np, point_t);
97+
9598
m_verbose = parameters::choose_parameter(parameters::get_parameter(np, internal_np::verbose), false);
9699
m_debug = parameters::choose_parameter(parameters::get_parameter(np, internal_np::debug), false);
97100

@@ -178,7 +181,14 @@ class Kinetic_surface_reconstruction_3 {
178181
179182
*/
180183
template<typename CGAL_NP_TEMPLATE_PARAMETERS>
181-
std::size_t detect_planar_shapes(const CGAL_NP_CLASS& np = parameters::default_values()) {
184+
std::size_t detect_planar_shapes(const CGAL_NP_CLASS& np = parameters::default_values())
185+
{
186+
CGAL_CHECK_AUTHORIZED_NAMED_PARAMETERS(np, point_t, normal_t, k_neighbors_t, maximum_distance_t, maximum_angle_t,
187+
minimum_region_size_t, angle_tolerance_t, maximum_offset_t,
188+
regularize_parallelism_t, regularize_orthogonality_t, regularize_coplanarity_t,
189+
regularize_axis_symmetry_t, symmetry_direction_t);
190+
191+
182192
m_verbose = parameters::choose_parameter(parameters::get_parameter(np, internal_np::verbose), m_verbose);
183193
m_debug = parameters::choose_parameter(parameters::get_parameter(np, internal_np::debug), m_debug);
184194

@@ -319,7 +329,13 @@ class Kinetic_surface_reconstruction_3 {
319329
320330
*/
321331
template<typename CGAL_NP_TEMPLATE_PARAMETERS>
322-
void detection_and_partition(std::size_t k, const CGAL_NP_CLASS& np = parameters::default_values()) {
332+
void detection_and_partition(std::size_t k, const CGAL_NP_CLASS& np = parameters::default_values())
333+
{
334+
CGAL_CHECK_AUTHORIZED_NAMED_PARAMETERS(np, point_t, normal_t, k_neighbors_t, maximum_distance_t, maximum_angle_t,
335+
minimum_region_size_t, angle_tolerance_t, maximum_offset_t, regularize_parallelism_t,
336+
regularize_orthogonality_t, regularize_coplanarity_t, regularize_axis_symmetry_t,
337+
symmetry_direction_t, reorient_bbox_t, bbox_dilation_ratio_t);
338+
323339
detect_planar_shapes(np);
324340
initialize_partition(np);
325341
partition(k);
@@ -373,7 +389,10 @@ class Kinetic_surface_reconstruction_3 {
373389
\pre shape detection performed
374390
*/
375391
template<typename CGAL_NP_TEMPLATE_PARAMETERS>
376-
void initialize_partition(const CGAL_NP_CLASS& np = parameters::default_values()) {
392+
void initialize_partition(const CGAL_NP_CLASS& np = parameters::default_values())
393+
{
394+
CGAL_CHECK_AUTHORIZED_NAMED_PARAMETERS(np, reorient_bbox_t, bbox_dilation_ratio_t);
395+
377396
m_kinetic_partition.initialize(np);
378397
}
379398

‎Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/edge_collapse.h‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,11 @@ int edge_collapse(TM& tmesh,
8787
const ShouldStop& should_stop,
8888
const NamedParameters& np = parameters::default_values())
8989
{
90+
CGAL_CHECK_AUTHORIZED_NAMED_PARAMETERS(np, vertex_point_t, geom_traits_t, halfedge_index_t, get_cost_policy_t,
91+
get_placement_policy_t, filter_t, edge_is_constrained_t,
92+
visitor_t, vertex_index_t, use_relaxed_order_t);
93+
94+
9095
using parameters::choose_parameter;
9196
using parameters::get_parameter;
9297

‎Tetrahedral_remeshing/include/CGAL/Adaptive_remeshing_sizing_field.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -346,6 +346,8 @@ Adaptive_remeshing_sizing_field<Tr>
346346
create_adaptive_remeshing_sizing_field(const Tr& tr,
347347
const CGAL_NP_CLASS& np = parameters::default_values())
348348
{
349+
CGAL_CHECK_AUTHORIZED_NAMED_PARAMETERS(np, edge_is_constrained_t, facet_is_constrained_t, cell_selector_t);
350+
349351
using parameters::choose_parameter;
350352
using parameters::get_parameter;
351353

‎Tetrahedral_remeshing/include/CGAL/tetrahedral_remeshing.h‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,10 @@ void tetrahedral_isotropic_remeshing(
188188
const SizingFunction& sizing,
189189
const NamedParameters& np = parameters::default_values())
190190
{
191+
CGAL_CHECK_AUTHORIZED_NAMED_PARAMETERS(np, number_of_iterations_t, remesh_boundaries_t, facet_is_constrained_t,
192+
edge_is_constrained_t, vertex_is_constrained_t, cell_selector_t,
193+
smooth_constrained_edges_t);
194+
191195
CGAL_expensive_assertion(tr.is_valid());
192196

193197
using Tr = CGAL::Triangulation_3<Traits, TDS, SLDS>;
@@ -357,6 +361,8 @@ convert_to_triangulation_3(
357361
CGAL::Mesh_complex_3_in_triangulation_3<Tr, CornerIndex, CurveIndex> c3t3,
358362
const NamedParameters& np = parameters::default_values())
359363
{
364+
CGAL_CHECK_AUTHORIZED_NAMED_PARAMETERS(np, edge_is_constrained_t, vertex_is_constrained_t);
365+
360366
using parameters::get_parameter;
361367
using parameters::choose_parameter;
362368

0 commit comments

Comments
 (0)