songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix CI

This commit is contained in:
ange-clement 2023-10-16 13:26:20 +02:00
parent bec5358ff1
commit 0d0c1f3213
3 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Mesh_3/examples/Mesh_3/mesh_3D_image_with_initial_points.cpp
View File

@ -46,8 +46,8 @@ int main()
Mesh_criteria criteria(params::facet_angle(30).facet_size(3).facet_distance(1). Mesh_criteria criteria(params::facet_angle(30).facet_size(3).facet_distance(1).
cell_radius_edge_ratio(3).cell_size(3)); cell_radius_edge_ratio(3).cell_size(3));
C3t3 c3t3 = CGAL::make_mesh_3<C3t3>(domain, criteria, C3t3 c3t3 = CGAL::make_mesh_3<C3t3>(domain, criteria
params::initial_points_generator(Construct_initial_points_labeled_image(image)) , params::initial_points_generator(Construct_initial_points_labeled_image(image))
); );
/// [Meshing] /// [Meshing]

14
Mesh_3/include/CGAL/make_mesh_3.h
View File

@ -41,7 +41,7 @@ namespace internal {
template < typename C3T3, typename MeshDomain, typename MeshCriteria, typename InitialPointsGenerator = Null_functor > template < typename C3T3, typename MeshDomain, typename MeshCriteria, typename InitialPointsGenerator = Null_functor >
void void
init_c3t3(C3T3& c3t3, const MeshDomain& domain, const MeshCriteria&, init_c3t3(C3T3& c3t3, const MeshDomain& domain, const MeshCriteria&,
const int nb_initial_points, InitialPointsGenerator& generator = Null_functor_internal::default_null_functor) const int nb_initial_points, InitialPointsGenerator& generator = Null_functor())
{ {
typedef typename MeshDomain::Point_3 Point_3; typedef typename MeshDomain::Point_3 Point_3;
typedef typename MeshDomain::Index Index; typedef typename MeshDomain::Index Index;
@ -59,7 +59,7 @@ init_c3t3(C3T3& c3t3, const MeshDomain& domain, const MeshCriteria&,
// Mesh initialization : get some points and add them to the mesh // Mesh initialization : get some points and add them to the mesh
Initial_points_vector initial_points; Initial_points_vector initial_points;
auto& generator_wrapped = auto generator_wrapped =
Initial_points_generator_generator()(generator); Initial_points_generator_generator()(generator);
if (nb_initial_points > -1) if (nb_initial_points > -1)
generator_wrapped(std::back_inserter(initial_points), domain, c3t3, generator_wrapped(std::back_inserter(initial_points), domain, c3t3,
@ -184,7 +184,7 @@ struct C3t3_initializer < C3T3, MD, MC, false, HasFeatures, InitialPointsGenerat
const MC& criteria, const MC& criteria,
bool with_features, bool with_features,
Mesh_3_options mesh_options = Mesh_3_options(), Mesh_3_options mesh_options = Mesh_3_options(),
InitialPointsGenerator& generator = Null_functor_internal::default_null_functor) InitialPointsGenerator& generator = Null_functor())
{ {
if ( with_features ) if ( with_features )
{ {
@ -208,7 +208,7 @@ struct C3t3_initializer < C3T3, MD, MC, true, HasFeatures, InitialPointsGenerato
const MC& criteria, const MC& criteria,
bool with_features, bool with_features,
Mesh_3_options mesh_options = Mesh_3_options(), Mesh_3_options mesh_options = Mesh_3_options(),
InitialPointsGenerator& generator = Null_functor_internal::default_null_functor) InitialPointsGenerator& generator = Null_functor())
{ {
C3t3_initializer < C3T3, MD, MC, true, typename MD::Has_features, InitialPointsGenerator >() C3t3_initializer < C3T3, MD, MC, true, typename MD::Has_features, InitialPointsGenerator >()
(c3t3,domain,criteria,with_features,mesh_options,generator); (c3t3,domain,criteria,with_features,mesh_options,generator);
@ -230,7 +230,7 @@ struct C3t3_initializer < C3T3, MD, MC, true, CGAL::Tag_true, InitialPointsGener
const MC& criteria, const MC& criteria,
bool with_features, bool with_features,
Mesh_3_options mesh_options = Mesh_3_options(), Mesh_3_options mesh_options = Mesh_3_options(),
InitialPointsGenerator& generator = Null_functor_internal::default_null_functor) InitialPointsGenerator& generator = Null_functor())
{ {
if ( with_features ) { if ( with_features ) {
this->initialize_features(c3t3, domain, criteria,mesh_options); this->initialize_features(c3t3, domain, criteria,mesh_options);
@ -276,7 +276,7 @@ struct C3t3_initializer < C3T3, MD, MC, true, CGAL::Tag_false, InitialPointsGene
const MC& criteria, const MC& criteria,
bool with_features, bool with_features,
Mesh_3_options mesh_options = Mesh_3_options(), Mesh_3_options mesh_options = Mesh_3_options(),
InitialPointsGenerator& generator = Null_functor_internal::default_null_functor) InitialPointsGenerator& generator = Null_functor())
{ {
if ( with_features ) if ( with_features )
{ {
@ -524,7 +524,7 @@ void make_mesh_3_impl(C3T3& c3t3,
mesh_options = parameters::internal::Mesh_3_options(), mesh_options = parameters::internal::Mesh_3_options(),
const parameters::internal::Manifold_options& const parameters::internal::Manifold_options&
manifold_options = parameters::internal::Manifold_options(), manifold_options = parameters::internal::Manifold_options(),
InitialPointsGenerator& generator = Null_functor_internal::default_null_functor) InitialPointsGenerator& generator = Null_functor())
{ {
#ifdef CGAL_MESH_3_INITIAL_POINTS_NO_RANDOM_SHOOTING #ifdef CGAL_MESH_3_INITIAL_POINTS_NO_RANDOM_SHOOTING
CGAL::get_default_random() = CGAL::Random(0); CGAL::get_default_random() = CGAL::Random(0);

4
STL_Extension/include/CGAL/tags.h
View File

@ -53,10 +53,6 @@ struct Null_functor {
typedef Null_tag result_type; typedef Null_tag result_type;
typedef Null_tag second_argument_type; typedef Null_tag second_argument_type;
}; };
namespace Null_functor_internal
{
static Null_functor default_null_functor;
} // namespace Null_functor_internal
// For concurrency // For concurrency
struct Sequential_tag {}; struct Sequential_tag {};