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

Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch

This commit is contained in:
Laurent Rineau 2019-05-21 16:35:24 +02:00
parent 1b92bcd74e 92a311c04a
commit e4c82fa260
7 changed files with 21 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Installation/lib/cmake/CGAL/CGALConfig.cmake
View File

@ -131,7 +131,11 @@ include(CGAL_setup_target_dependencies)
foreach(cgal_lib ${CGAL_LIBRARIES})
set(WITH_${cgal_lib} TRUE)
if(${cgal_lib}_FOUND AND NOT TARGET ${cgal_lib})
add_library(${cgal_lib} INTERFACE)
if(CGAL_BUILDING_LIBS OR CMAKE_VERSION VERSION_LESS "3.11")
add_library(${cgal_lib} INTERFACE)
else()
add_library(${cgal_lib} INTERFACE IMPORTED GLOBAL)
endif()
if(NOT TARGET CGAL::${cgal_lib})
add_library(CGAL::${cgal_lib} ALIAS ${cgal_lib})
endif()

5
Mesh_3/examples/Mesh_3/CMakeLists.txt
View File

@ -67,7 +67,6 @@ if ( CGAL_FOUND )
endif()
if ( Boost_FOUND AND Boost_VERSION GREATER 103400 )
# Compilable examples
create_single_source_cgal_program( "mesh_hybrid_mesh_domain.cpp" )
create_single_source_cgal_program( "mesh_implicit_sphere.cpp" )
@ -136,10 +135,6 @@ if ( CGAL_FOUND )
endif()
endforeach()
else()
message(STATUS "NOTICE: This program requires Boost >= 1.34.1, and will not be compiled.")
endif()
else()
message(STATUS "This program requires the CGAL library, and will not be compiled.")
endif()

2
Mesh_3/examples/Mesh_3/mesh_3D_image_with_custom_initialization.cpp
View File

@ -54,7 +54,7 @@ int main()
image,
criteria,
(unsigned char)0);
CGAL::refine_mesh_3<C3t3>(c3t3, domain, criteria);
CGAL::refine_mesh_3(c3t3, domain, criteria);
/// [Meshing]
// Output

20
Mesh_3/include/CGAL/Mesh_criteria_3.h
View File

@ -83,17 +83,17 @@ public:
typedef CellCriteria Cell_criteria;
// Constructor
Mesh_criteria_3_impl(const Facet_criteria& facet_criteria,
const Cell_criteria& cell_criteria)
Mesh_criteria_3_impl(Facet_criteria facet_criteria,
Cell_criteria cell_criteria)
: edge_criteria_(0)
, facet_criteria_(facet_criteria)
, cell_criteria_(cell_criteria)
{ }
// Constructor
Mesh_criteria_3_impl(const Edge_criteria& edge_criteria,
const Facet_criteria& facet_criteria,
const Cell_criteria& cell_criteria)
Mesh_criteria_3_impl(Edge_criteria edge_criteria,
Facet_criteria facet_criteria,
Cell_criteria cell_criteria)
: edge_criteria_(edge_criteria)
, facet_criteria_(facet_criteria)
, cell_criteria_(cell_criteria)
@ -182,15 +182,15 @@ public:
typedef typename Base::Cell_criteria Cell_criteria;
// Constructor
Mesh_criteria_3(const Facet_criteria& facet_criteria,
const Cell_criteria& cell_criteria)
Mesh_criteria_3(Facet_criteria facet_criteria,
Cell_criteria cell_criteria)
: Base(facet_criteria,
cell_criteria) {}
// Constructor
Mesh_criteria_3(const Edge_criteria& edge_criteria,
const Facet_criteria& facet_criteria,
const Cell_criteria& cell_criteria)
Mesh_criteria_3(Edge_criteria edge_criteria,
Facet_criteria facet_criteria,
Cell_criteria cell_criteria)
: Base(edge_criteria,
facet_criteria,
cell_criteria) {}

2
Mesh_3/test/Mesh_3/test_meshing_polyhedral_complex.cpp
View File

@ -106,7 +106,7 @@ struct Polyhedral_complex_tester : public Tester<K>
true /*nonlinear_growth_of_balls*/);
domain.add_vertices_to_c3t3_on_patch_without_feature_edges(c3t3);
CGAL::refine_mesh_3<C3t3>(c3t3, domain, criteria);
CGAL::refine_mesh_3(c3t3, domain, criteria);
CGAL::remove_far_points_in_mesh_3(c3t3);

8
Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2.h
View File

@ -589,12 +589,8 @@ public:
typedef std::vector<std::size_t> Vertex_indices;
typedef std::vector<Vertex_handle> Vertices;
Vertex_indices vertex_indices;
vertex_indices.resize(points.size());
std::copy(boost::counting_iterator<std::size_t>(0),
boost::counting_iterator<std::size_t>(points.size()),
std::back_inserter(vertex_indices));
Vertex_indices vertex_indices(boost::counting_iterator<std::size_t>(0),
boost::counting_iterator<std::size_t>(points.size()));
size_type n = this->number_of_vertices();
Spatial_sort_traits_adapter_2<Gt,

8
Triangulation_2/include/CGAL/Triangulation_2/insert_constraints.h
View File

@ -52,12 +52,8 @@ namespace CGAL {
typedef std::vector<std::size_t> Vertex_indices;
typedef std::vector<Vertex_handle> Vertices;
Vertex_indices vertex_indices;
vertex_indices.resize(points.size());
std::copy(boost::counting_iterator<std::ptrdiff_t>(0),
boost::counting_iterator<std::ptrdiff_t>(points.size()),
std::back_inserter(vertex_indices));
Vertex_indices vertex_indices(boost::counting_iterator<std::ptrdiff_t>(0),
boost::counting_iterator<std::ptrdiff_t>(points.size()));
typename T::size_type n = t.number_of_vertices();
CGAL::Spatial_sort_traits_adapter_2<