From 789ee361cb23d6cd0d4775dd7757dec27a76bddd Mon Sep 17 00:00:00 2001 From: iyaz Date: Fri, 10 May 2013 15:42:01 +0300 Subject: [PATCH] nontype template parameter name is changed from fast_bbox_intersection to Fast_sdf_calculation_mode --- .../include/CGAL/mesh_segmentation.h | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Surface_mesh_segmentation/include/CGAL/mesh_segmentation.h b/Surface_mesh_segmentation/include/CGAL/mesh_segmentation.h index 5fa45fdea10..f11139c0d28 100644 --- a/Surface_mesh_segmentation/include/CGAL/mesh_segmentation.h +++ b/Surface_mesh_segmentation/include/CGAL/mesh_segmentation.h @@ -36,8 +36,8 @@ namespace CGAL * @param traits traits object * @return minimum and maximum SDF values before linear normalization */ -template + internal::Surface_mesh_segmentation algorithm(polyhedron, traits); return algorithm.calculate_sdf_values(cone_angle, number_of_rays, sdf_values); } @@ -128,7 +128,7 @@ segment_from_sdf_values(const Polyhedron& polyhedron, * call `CGAL::segment_from_sdf_values`. * * @pre @a polyhedron.is_pure_triangle() - * @tparam fast_bbox_intersection regardless of `GeomTraits`, use inexact predicates while traversing AABB tree nodes. + * @tparam Fast_sdf_calculation_mode regardless of `GeomTraits`, use inexact predicates while traversing AABB tree nodes. * It is default to true, and can be omitted. * @tparam Polyhedron a %CGAL polyhedron * @tparam SegmentPropertyMap a `ReadWritePropertyMap` with `Polyhedron::Facet_const_handle` as key and `int` as value type @@ -142,7 +142,7 @@ segment_from_sdf_values(const Polyhedron& polyhedron, * @param traits traits object * @return number of segments */ -template < bool fast_bbox_intersection, class Polyhedron, +template < bool Fast_sdf_calculation_mode, class Polyhedron, class SegmentPropertyMap, class GeomTraits #ifndef BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS = typename Polyhedron::Traits @@ -163,7 +163,7 @@ compute_sdf_values_and_segment(const Polyhedron& polyhedron, boost::associative_property_map sdf_property_map( internal_sdf_map); - compute_sdf_values, GeomTraits> + compute_sdf_values, GeomTraits> (polyhedron, sdf_property_map, cone_angle, number_of_rays, traits); return segment_from_sdf_values, SegmentPropertyMap, GeomTraits> (polyhedron, sdf_property_map, segment_ids, number_of_levels, smoothing_lambda, @@ -192,7 +192,7 @@ compute_sdf_values_and_segment(const Polyhedron& polyhedron, /// @endcond #ifdef BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS -template +template std::pair compute_sdf_values(const Polyhedron& polyhedron, SDFPropertyMap sdf_values, @@ -200,7 +200,7 @@ compute_sdf_values(const Polyhedron& polyhedron, int number_of_rays = 25, typename Polyhedron::Traits traits = typename Polyhedron::Traits()) { - return compute_sdf_values + return compute_sdf_values (polyhedron, sdf_values, cone_angle, number_of_rays, traits); } @@ -230,7 +230,7 @@ segment_from_sdf_values(const Polyhedron& polyhedron, traits); } -template +template int compute_sdf_values_and_segment(const Polyhedron& polyhedron, SegmentPropertyMap segment_ids, @@ -240,7 +240,7 @@ compute_sdf_values_and_segment(const Polyhedron& polyhedron, double smoothing_lambda = 0.26, typename Polyhedron::Traits traits = typename Polyhedron::Traits()) { - return compute_sdf_values_and_segment< fast_bbox_intersection, Polyhedron, SegmentPropertyMap, typename Polyhedron::Traits> + return compute_sdf_values_and_segment< Fast_sdf_calculation_mode, Polyhedron, SegmentPropertyMap, typename Polyhedron::Traits> (polyhedron, segment_ids, cone_angle, number_of_rays, number_of_levels, smoothing_lambda, traits); }