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

Merge remote-tracking branch 'cgal/master' into Nef_3-translation-GF

This commit is contained in:
Andreas Fabri 2021-04-27 15:23:56 +01:00
parent b55cef9043 a1c65ca1d5
commit c238e9dab5
767 changed files with 99508 additions and 4326 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.clang-tidy Normal file
View File

@ -0,0 +1,5 @@
---
Checks: '-clang-diagnostic*,-clang-analyzer*,modernize-use-nullptr'
HeaderFilterRegex: 'CGAL/*'
...

2
.github/workflows/build_doc.yml vendored
View File

@ -73,7 +73,7 @@ jobs:
wget --no-verbose cgal.github.io -O tmp.html
if ! egrep -q "\/$PR_NUMBER\/$ROUND" tmp.html; then
#list impacted packages
LIST_OF_PKGS=$(git diff --name-only HEAD^1 HEAD |cut -s -d/ -f1 |sort -u | xargs -I {} ls -d {}/package_info 2>/dev/null |cut -d/ -f1 |egrep -v Installation||true)
LIST_OF_PKGS=$(git diff --name-only HEAD^1 HEAD |cut -s -d/ -f1 |sort -u | xargs -I {} echo {} && ls -d {}/package_info 2>/dev/null |cut -d/ -f1 |egrep -v Installation||true)
if [ "$LIST_OF_PKGS" = "" ]; then
exit 1
fi

2
AABB_tree/benchmark/AABB_tree/CMakeLists.txt
View File

@ -1,7 +1,7 @@
# Created by the script cgal_create_cmake_script
# This is the CMake script for compiling a CGAL application.
cmake_minimum_required(VERSION 3.1...3.14)
cmake_minimum_required(VERSION 3.1...3.20)
project(AABB_traits_benchmark)
find_package(CGAL REQUIRED OPTIONAL_COMPONENTS Core)

2
AABB_tree/demo/AABB_tree/CMakeLists.txt
View File

@ -1,6 +1,6 @@
# This is the CMake script for compiling the AABB tree demo.
cmake_minimum_required(VERSION 3.1...3.15)
cmake_minimum_required(VERSION 3.1...3.20)
project(AABB_tree_Demo)
# Find includes in corresponding build directories

20
AABB_tree/demo/AABB_tree/MainWindow.cpp
View File

@ -154,7 +154,7 @@ void MainWindow::on_actionInside_points_triggered()
bool ok;
const unsigned int nb_points = (unsigned)
QInputDialog::getInt(NULL, "#Points",
QInputDialog::getInt(nullptr, "#Points",
"#Points:",10000,1,100000000,9,&ok);
if(!ok)
@ -171,19 +171,19 @@ void MainWindow::on_actionPoints_in_interval_triggered()
bool ok;
const unsigned int nb_points = (unsigned)
QInputDialog::getInt(NULL, "#Points",
QInputDialog::getInt(nullptr, "#Points",
"#Points:",10000,1,100000000,9,&ok);
if(!ok)
return;
const double min =
QInputDialog::getDouble(NULL, "min",
QInputDialog::getDouble(nullptr, "min",
"Min:",-0.1,-1000.0,1000.0,9,&ok);
if(!ok)
return;
const double max =
QInputDialog::getDouble(NULL, "max",
QInputDialog::getDouble(nullptr, "max",
"Max:",0.1,-1000.0,1000.0,9,&ok);
if(!ok)
return;
@ -199,7 +199,7 @@ void MainWindow::on_actionBoundary_segments_triggered()
bool ok;
const unsigned int nb_slices = (unsigned)
QInputDialog::getInt(NULL, "#Slices",
QInputDialog::getInt(nullptr, "#Slices",
"Slices:",100,1,1000000,8,&ok);
if(!ok)
@ -216,7 +216,7 @@ void MainWindow::on_actionBoundary_points_triggered()
bool ok;
const unsigned int nb_points = (unsigned)
QInputDialog::getInt(NULL, "#Points",
QInputDialog::getInt(nullptr, "#Points",
"Points:",1000,1,10000000,8,&ok);
if(!ok)
@ -233,7 +233,7 @@ void MainWindow::on_actionEdge_points_triggered()
bool ok;
const unsigned int nb_points = (unsigned)
QInputDialog::getInt(NULL, "#Points",
QInputDialog::getInt(nullptr, "#Points",
"Points:",1000,1,10000000,8,&ok);
if(!ok)
@ -248,7 +248,7 @@ void MainWindow::on_actionEdge_points_triggered()
void MainWindow::on_actionBench_distances_triggered()
{
bool ok;
const double duration = QInputDialog::getDouble(NULL, "Duration",
const double duration = QInputDialog::getDouble(nullptr, "Duration",
"Duration (s):",1.0,0.01,1000,8,&ok);
if(!ok)
return;
@ -262,7 +262,7 @@ void MainWindow::on_actionBench_distances_triggered()
void MainWindow::on_actionBench_intersections_triggered()
{
bool ok;
const double duration = QInputDialog::getDouble(NULL, "Duration",
const double duration = QInputDialog::getDouble(nullptr, "Duration",
"Duration (s):",1.0,0.01,1000.0,8,&ok);
if(!ok)
return;
@ -361,7 +361,7 @@ void MainWindow::on_actionRefine_bisection_triggered()
{
bool ok;
const double max_len =
QInputDialog::getDouble(NULL, "Max edge len",
QInputDialog::getDouble(nullptr, "Max edge len",
"Max edge len:",0.1,0.001,100.0,9,&ok);
if(!ok)
return;

2
AABB_tree/demo/AABB_tree/MainWindow.h
View File

@ -18,7 +18,7 @@ class MainWindow :
{
Q_OBJECT
public:
MainWindow(QWidget* parent = 0);
MainWindow(QWidget* parent = nullptr);
~MainWindow();
public slots:

28
AABB_tree/demo/AABB_tree/Scene.cpp
View File

@ -33,7 +33,7 @@ Scene::Scene()
, m_grid_size(slow_distance_grid_size)
, m_cut_plane(NONE)
{
m_pPolyhedron = NULL;
m_pPolyhedron = nullptr;
// view options
m_view_points = true;
@ -541,7 +541,7 @@ int Scene::open(QString filename)
return -1;
}
if(m_pPolyhedron != NULL)
if(m_pPolyhedron != nullptr)
delete m_pPolyhedron;
// allocate new polyhedron
@ -553,7 +553,7 @@ int Scene::open(QString filename)
QApplication::restoreOverrideCursor();
delete m_pPolyhedron;
m_pPolyhedron = NULL;
m_pPolyhedron = nullptr;
return -1;
}
@ -571,7 +571,7 @@ void Scene::update_bbox()
std::cout << "Compute bbox...";
m_bbox = Bbox();
if(m_pPolyhedron == NULL)
if(m_pPolyhedron == nullptr)
{
std::cout << "failed (no polyhedron)." << std::endl;
return;
@ -794,7 +794,7 @@ FT Scene::bbox_diag() const
void Scene::build_facet_tree()
{
if ( NULL == m_pPolyhedron )
if ( nullptr == m_pPolyhedron )
{
std::cerr << "Build facet tree failed: load polyhedron first." << std::endl;
return;
@ -813,7 +813,7 @@ void Scene::build_facet_tree()
void Scene::build_edge_tree()
{
if ( NULL == m_pPolyhedron )
if ( nullptr == m_pPolyhedron )
{
std::cerr << "Build edge tree failed: load polyhedron first." << std::endl;
return;
@ -860,7 +860,7 @@ void Scene::generate_points_in(const unsigned int nb_points,
const double vmin,
const double vmax)
{
if(m_pPolyhedron == NULL)
if(m_pPolyhedron == nullptr)
{
std::cout << "Load polyhedron first." << std::endl;
return;
@ -913,7 +913,7 @@ void Scene::generate_points_in(const unsigned int nb_points,
void Scene::generate_inside_points(const unsigned int nb_points)
{
if(m_pPolyhedron == NULL)
if(m_pPolyhedron == nullptr)
{
std::cout << "Load polyhedron first." << std::endl;
return;
@ -955,7 +955,7 @@ void Scene::generate_inside_points(const unsigned int nb_points)
void Scene::generate_boundary_segments(const unsigned int nb_slices)
{
if(m_pPolyhedron == NULL)
if(m_pPolyhedron == nullptr)
{
std::cout << "Load polyhedron first." << std::endl;
return;
@ -1005,7 +1005,7 @@ void Scene::generate_boundary_segments(const unsigned int nb_slices)
void Scene::generate_boundary_points(const unsigned int nb_points)
{
if(m_pPolyhedron == NULL)
if(m_pPolyhedron == nullptr)
{
std::cout << "Load polyhedron first." << std::endl;
return;
@ -1055,7 +1055,7 @@ void Scene::generate_boundary_points(const unsigned int nb_points)
void Scene::generate_edge_points(const unsigned int nb_points)
{
if(m_pPolyhedron == NULL)
if(m_pPolyhedron == nullptr)
{
std::cout << "Load polyhedron first." << std::endl;
return;
@ -1219,7 +1219,7 @@ void Scene::cut_segment_plane()
{
const Segment* inter_seg = CGAL::object_cast<Segment>(&(it->first));
if ( NULL != inter_seg )
if ( nullptr != inter_seg )
{
m_cut_segments.push_back(*inter_seg);
}
@ -1280,7 +1280,7 @@ void Scene::toggle_view_plane()
void Scene::refine_bisection(const FT max_sqlen)
{
if(m_pPolyhedron == NULL)
if(m_pPolyhedron == nullptr)
{
std::cout << "Load polyhedron first." << std::endl;
return;
@ -1295,7 +1295,7 @@ void Scene::refine_bisection(const FT max_sqlen)
void Scene::refine_loop()
{
if(m_pPolyhedron == NULL)
if(m_pPolyhedron == nullptr)
{
std::cout << "Load polyhedron first." << std::endl;
return;

4
AABB_tree/demo/AABB_tree/Viewer.cpp
View File

@ -6,7 +6,7 @@
Viewer::Viewer(QWidget* parent)
: CGAL::QGLViewer(parent),
m_pScene(NULL),
m_pScene(nullptr),
m_custom_mouse(false)
{
}
@ -19,7 +19,7 @@ void Viewer::setScene(Scene* pScene)
void Viewer::draw()
{
CGAL::QGLViewer::draw();
if(m_pScene != NULL)
if(m_pScene != nullptr)
{
m_pScene->draw(this);
}

12
AABB_tree/demo/AABB_tree/benchmarks.cpp
View File

@ -6,7 +6,7 @@
void Scene::benchmark_intersections(const double duration)
{
if(m_pPolyhedron == NULL)
if(m_pPolyhedron == nullptr)
{
std::cout << "Load polyhedron first." << std::endl;
return;
@ -67,7 +67,7 @@ void Scene::bench_intersections(Facet_tree& tree,
void Scene::benchmark_distances(const double duration)
{
if(m_pPolyhedron == NULL)
if(m_pPolyhedron == nullptr)
{
std::cout << "Load polyhedron first." << std::endl;
return;
@ -101,7 +101,7 @@ std::size_t Scene::nb_digits(std::size_t value)
// refinement loop
void Scene::bench_memory()
{
if(m_pPolyhedron == NULL)
if(m_pPolyhedron == nullptr)
{
std::cout << "Load polyhedron first." << std::endl;
return;
@ -137,7 +137,7 @@ void Scene::bench_memory()
void Scene::bench_construction()
{
if(m_pPolyhedron == NULL)
if(m_pPolyhedron == nullptr)
{
std::cout << "Load polyhedron first." << std::endl;
return;
@ -174,7 +174,7 @@ void Scene::bench_construction()
void Scene::bench_intersections_vs_nbt()
{
if(m_pPolyhedron == NULL)
if(m_pPolyhedron == nullptr)
{
std::cout << "Load polyhedron first." << std::endl;
return;
@ -218,7 +218,7 @@ void Scene::bench_intersections_vs_nbt()
void Scene::bench_distances_vs_nbt()
{
if(m_pPolyhedron == NULL)
if(m_pPolyhedron == nullptr)
{
std::cout << "Load polyhedron first." << std::endl;
return;

2
AABB_tree/examples/AABB_tree/AABB_custom_indexed_triangle_set_array_example.cpp
View File

@ -99,7 +99,7 @@ public:
// types
typedef CGAL::AABB_traits<K, My_triangle_primitive> My_AABB_traits;
typedef CGAL::AABB_tree<My_AABB_traits> Tree;
const double* My_triangle_primitive::point_container = 0;
const double* My_triangle_primitive::point_container = nullptr;
int main()
{

2
AABB_tree/examples/AABB_tree/AABB_custom_indexed_triangle_set_example.cpp
View File

@ -106,7 +106,7 @@ public:
// types
typedef CGAL::AABB_traits<K, My_triangle_primitive> My_AABB_traits;
typedef CGAL::AABB_tree<My_AABB_traits> Tree;
const std::vector<My_point>* My_triangle_primitive::point_container = 0;
const std::vector<My_point>* My_triangle_primitive::point_container = nullptr;
int main()
{

2
AABB_tree/examples/AABB_tree/CMakeLists.txt
View File

@ -1,7 +1,7 @@
# Created by the script cgal_create_cmake_script
# This is the CMake script for compiling a CGAL application.
cmake_minimum_required(VERSION 3.1...3.15)
cmake_minimum_required(VERSION 3.1...3.20)
project(AABB_tree_Examples)
find_package(CGAL REQUIRED)

2
AABB_tree/test/AABB_tree/CMakeLists.txt
View File

@ -1,7 +1,7 @@
# Created by the script cgal_create_cmake_script
# This is the CMake script for compiling a CGAL application.
cmake_minimum_required(VERSION 3.1...3.15)
cmake_minimum_required(VERSION 3.1...3.20)
project(AABB_tree_Tests)
find_package(CGAL REQUIRED)

2
Advancing_front_surface_reconstruction/examples/Advancing_front_surface_reconstruction/CMakeLists.txt
View File

@ -1,7 +1,7 @@
# Created by the script cgal_create_cmake_script
# This is the CMake script for compiling a CGAL application.
cmake_minimum_required(VERSION 3.1...3.15)
cmake_minimum_required(VERSION 3.1...3.20)
project(Advancing_front_surface_reconstruction_Examples)
find_package(CGAL REQUIRED)

2
Advancing_front_surface_reconstruction/test/Advancing_front_surface_reconstruction/CMakeLists.txt
View File

@ -1,7 +1,7 @@
# Created by the script cgal_create_cmake_script
# This is the CMake script for compiling a CGAL application.
cmake_minimum_required(VERSION 3.1...3.15)
cmake_minimum_required(VERSION 3.1...3.20)
project(Advancing_front_surface_reconstruction_Tests)
find_package(CGAL REQUIRED)

2
Algebraic_foundations/examples/Algebraic_foundations/CMakeLists.txt
View File

@ -1,7 +1,7 @@
# Created by the script cgal_create_cmake_script
# This is the CMake script for compiling a CGAL application.
cmake_minimum_required(VERSION 3.1...3.15)
cmake_minimum_required(VERSION 3.1...3.20)
project(Algebraic_foundations_Examples)
find_package(CGAL REQUIRED)

2
Algebraic_foundations/test/Algebraic_foundations/CMakeLists.txt
View File

@ -1,7 +1,7 @@
# Created by the script cgal_create_cmake_script
# This is the CMake script for compiling a CGAL application.
cmake_minimum_required(VERSION 3.1...3.15)
cmake_minimum_required(VERSION 3.1...3.20)
project(Algebraic_foundations_Tests)
find_package(CGAL REQUIRED COMPONENTS Core)

2
Algebraic_kernel_d/examples/Algebraic_kernel_d/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.1...3.15)
cmake_minimum_required(VERSION 3.1...3.20)
project(Algebraic_kernel_d_Examples)
find_package(CGAL REQUIRED COMPONENTS Core)

2
Algebraic_kernel_d/test/Algebraic_kernel_d/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.1...3.15)
cmake_minimum_required(VERSION 3.1...3.20)
project(Algebraic_kernel_d_Tests)
# CGAL and its components

2
Algebraic_kernel_for_circles/test/Algebraic_kernel_for_circles/CMakeLists.txt
View File

@ -1,7 +1,7 @@
# Created by the script cgal_create_cmake_script
# This is the CMake script for compiling a CGAL application.
cmake_minimum_required(VERSION 3.1...3.15)
cmake_minimum_required(VERSION 3.1...3.20)
project(Algebraic_kernel_for_circles_Tests)
find_package(CGAL REQUIRED)

2
Algebraic_kernel_for_spheres/test/Algebraic_kernel_for_spheres/CMakeLists.txt
View File

@ -1,7 +1,7 @@
# Created by the script cgal_create_cmake_script
# This is the CMake script for compiling a CGAL application.
cmake_minimum_required(VERSION 3.1...3.15)
cmake_minimum_required(VERSION 3.1...3.20)
project(Algebraic_kernel_for_spheres_Tests)
find_package(CGAL REQUIRED)

4
Alpha_shapes_2/doc/Alpha_shapes_2/CGAL/Alpha_shape_2.h
View File

@ -37,7 +37,7 @@ does not make sense if the traits class already provides exact constructions.
<ul>
<li>When the tag `ExactAlphaComparisonTag` is set to \link Tag_true `Tag_true`\endlink,
the class `Cartesian_converter` is used internally to switch between the traits class
and the %CGAL kernel `CGAL::Simple_cartesian<NT>`, where `NT` can be either `CGAL::Interval_nt` or
and the \cgal kernel `CGAL::Simple_cartesian<NT>`, where `NT` can be either `CGAL::Interval_nt` or
`CGAL::Exact_rational`. `Cartesian_converter` must thus offer the necessary functors
to convert a two-dimensional point of the traits class to a two-dimensional point
of `CGAL::Simple_cartesian<NT>`. However, these functors are not necessarily provided by
@ -106,7 +106,7 @@ allowing filtered exact comparisons (that is, interval arithmetic is first used
resorting to exact arithmetic). Access to the interval containing the exact value is provided through the function
`FT::Approximate_nt approx() const` where `FT::Approximate_nt` is `CGAL::Interval_nt<Protected>`
with `Protected=true`. Access to the exact value is provided through the function
`FT::Exact_nt exact() const` where `FT::Exact_nt` depends on the configuration of %CGAL
`FT::Exact_nt exact() const` where `FT::Exact_nt` depends on the configuration of \cgal
(it is `Gmpq` if `gmp` is available and `Quotient<CGAL::MP_Float>` otherwise).
An overload for the function `double to_double(FT)` is also available. Its
precision is controlled through `FT::set_relative_precision_of_to_double()` in

2
Alpha_shapes_2/examples/Alpha_shapes_2/CMakeLists.txt
View File

@ -1,7 +1,7 @@
# Created by the script cgal_create_cmake_script
# This is the CMake script for compiling a CGAL application.
cmake_minimum_required(VERSION 3.1...3.15)
cmake_minimum_required(VERSION 3.1...3.20)
project(Alpha_shapes_2_Examples)
find_package(CGAL REQUIRED)

2
Alpha_shapes_2/test/Alpha_shapes_2/CMakeLists.txt
View File

@ -1,7 +1,7 @@
# Created by the script cgal_create_cmake_script
# This is the CMake script for compiling a CGAL application.
cmake_minimum_required(VERSION 3.1...3.15)
cmake_minimum_required(VERSION 3.1...3.20)
project(Alpha_shapes_2_Tests)
find_package(CGAL REQUIRED)

2
Alpha_shapes_3/demo/Alpha_shapes_3/CMakeLists.txt
View File

@ -1,7 +1,7 @@
# Created by the script cgal_create_cmake_script
# This is the CMake script for compiling a CGAL application.
cmake_minimum_required(VERSION 3.1...3.15)
cmake_minimum_required(VERSION 3.1...3.20)
project(Alpha_shapes_3_Demo)
# Find includes in corresponding build directories

2
Alpha_shapes_3/demo/Alpha_shapes_3/MainWindow.h
View File

@ -16,7 +16,7 @@ class MainWindow : public CGAL::Qt::DemosMainWindow, private Ui::MainWindow
Q_OBJECT
public:
MainWindow(QWidget* parent = 0);
MainWindow(QWidget* parent = nullptr);
void connectActions();

2
Alpha_shapes_3/doc/Alpha_shapes_3/Alpha_shapes_3.txt
View File

@ -71,7 +71,7 @@ meaning in particular that the alpha complex may have
singular faces. For \f$ 0 \leq k \leq d-1\f$,
a \f$ k\f$-simplex of the alpha complex is said to be
singular if it is not a facet of a \f$ (k+1)\f$-simplex of the complex.
%CGAL provides two versions of alpha shapes. In the general mode,
\cgal provides two versions of alpha shapes. In the general mode,
the alpha shapes correspond strictly to the above definition.
The regularized mode provides a regularized version of the alpha shapes.
It corresponds to the domain covered by a regularized version

4
Alpha_shapes_3/doc/Alpha_shapes_3/CGAL/Alpha_shape_3.h
View File

@ -36,7 +36,7 @@ does not make sense if the traits class already provides exact constructions.
<ul>
<li>When the tag `ExactAlphaComparisonTag` is set to \link Tag_true `Tag_true`\endlink,
the class `Cartesian_converter` is used internally to switch between the traits class
and the %CGAL kernel `CGAL::Simple_cartesian<NT>`, where `NT` can be either `CGAL::Interval_nt` or
and the \cgal kernel `CGAL::Simple_cartesian<NT>`, where `NT` can be either `CGAL::Interval_nt` or
`CGAL::Exact_rational`. `Cartesian_converter` must thus offer the necessary functors
to convert a three-dimensional point of the traits class to a three-dimensional point
of `CGAL::Simple_cartesian<NT>`. However, these functors are not necessarily provided by
@ -103,7 +103,7 @@ allowing filtered exact comparisons (that is, interval arithmetic is first used
resorting to exact arithmetic). Access to the interval containing the exact value is provided through the function
`FT::Approximate_nt approx() const` where `FT::Approximate_nt` is `Interval_nt<Protected>`
with `Protected=true`. Access to the exact value is provided through the function
`FT::Exact_nt exact() const` where `FT::Exact_nt` depends on the configuration of %CGAL
`FT::Exact_nt exact() const` where `FT::Exact_nt` depends on the configuration of \cgal
(it may be `mpq_class`, `Gmpq`, `Quotient<CGAL::MP_Float>`, etc).
An overload for the function `double to_double(FT)` is also available. Its
precision is controlled through `FT::set_relative_precision_of_to_double()` in

2
Alpha_shapes_3/examples/Alpha_shapes_3/CMakeLists.txt
View File

@ -1,7 +1,7 @@
# Created by the script cgal_create_cmake_script
# This is the CMake script for compiling a CGAL application.
cmake_minimum_required(VERSION 3.1...3.15)
cmake_minimum_required(VERSION 3.1...3.20)
project(Alpha_shapes_3_Examples)
find_package(CGAL REQUIRED)

2
Alpha_shapes_3/test/Alpha_shapes_3/CMakeLists.txt
View File

@ -1,7 +1,7 @@
# Created by the script cgal_create_cmake_script
# This is the CMake script for compiling a CGAL application.
cmake_minimum_required(VERSION 3.1...3.15)
cmake_minimum_required(VERSION 3.1...3.20)
project(Alpha_shapes_3_Tests)
find_package(CGAL REQUIRED)

2
Apollonius_graph_2/examples/Apollonius_graph_2/CMakeLists.txt
View File

@ -1,7 +1,7 @@
# Created by the script cgal_create_cmake_script
# This is the CMake script for compiling a CGAL application.
cmake_minimum_required(VERSION 3.1...3.15)
cmake_minimum_required(VERSION 3.1...3.20)
project(Apollonius_graph_2_Examples)
find_package(CGAL REQUIRED COMPONENTS Core)

2
Apollonius_graph_2/test/Apollonius_graph_2/CMakeLists.txt
View File

@ -1,7 +1,7 @@
# Created by the script cgal_create_cmake_script
# This is the CMake script for compiling a CGAL application.
cmake_minimum_required(VERSION 3.1...3.15)
cmake_minimum_required(VERSION 3.1...3.20)
project(Apollonius_graph_2_Tests)
find_package(CGAL REQUIRED)

2
Arithmetic_kernel/test/Arithmetic_kernel/CMakeLists.txt
View File

@ -1,7 +1,7 @@
# Created by the script cgal_create_cmake_script
# This is the CMake script for compiling a CGAL application.
cmake_minimum_required(VERSION 3.1...3.15)
cmake_minimum_required(VERSION 3.1...3.20)
project(Arithmetic_kernel_Tests)
find_package(CGAL REQUIRED COMPONENTS Core)

2
Arrangement_on_surface_2/demo/Arrangement_on_surface_2/AlgebraicCurveInputDialog.h
View File

@ -22,7 +22,7 @@ class AlgebraicCurveInputDialog : public QDialog
Q_OBJECT
public:
explicit AlgebraicCurveInputDialog(QWidget *parent = 0);
explicit AlgebraicCurveInputDialog(QWidget *parent = nullptr);
~AlgebraicCurveInputDialog();
std::string getLineEditText();
Ui::AlgebraicCurveInputDialog* getUi(){return this->ui;}

2
Arrangement_on_surface_2/demo/Arrangement_on_surface_2/ArrangementDemoGraphicsView.h
View File

@ -21,7 +21,7 @@ class QPaintEvent;
class ArrangementDemoGraphicsView : public QGraphicsView
{
public:
ArrangementDemoGraphicsView( QWidget* parent = 0 );
ArrangementDemoGraphicsView( QWidget* parent = nullptr );
void setBackgroundColor( QColor color );
QColor getBackgroundColor( ) const;

8
Arrangement_on_surface_2/demo/Arrangement_on_surface_2/ArrangementDemoPropertiesDialog.cpp
View File

@ -41,7 +41,7 @@ QVariant ArrangementDemoPropertiesDialog::property( int index )
}
QTableWidgetItem* item = this->ui->tableWidget->item( index, 0 );
if ( item == 0 )
if ( item == nullptr )
{
return res;
}
@ -102,17 +102,17 @@ void ArrangementDemoPropertiesDialog::setupUi( )
*/
void ArrangementDemoPropertiesDialog::updateUi( )
{
if ( this->parent == NULL )
if ( this->parent == nullptr )
{
return;
}
ArrangementDemoTab* currentTab = this->parent->getCurrentTab();
if ( currentTab == NULL )
if ( currentTab == nullptr )
{
return;
}
CGAL::Qt::ArrangementGraphicsItemBase* agi = currentTab->getArrangementGraphicsItem( );
if ( agi == NULL )
if ( agi == nullptr )
{
return;
}

2
Arrangement_on_surface_2/demo/Arrangement_on_surface_2/ArrangementDemoPropertiesDialog.h
View File

@ -41,7 +41,7 @@ class ArrangementDemoPropertiesDialog : public QDialog
GRID_COLOR_KEY /*!< color of the grid */
};
ArrangementDemoPropertiesDialog( ArrangementDemoWindow* parent_ = 0 );
ArrangementDemoPropertiesDialog( ArrangementDemoWindow* parent_ = nullptr );
QVariant property( int index );
protected:

2
Arrangement_on_surface_2/demo/Arrangement_on_surface_2/CMakeLists.txt
View File

@ -1,6 +1,6 @@
# This is the CMake script for compiling a CGAL application.
cmake_minimum_required(VERSION 3.1...3.15)
cmake_minimum_required(VERSION 3.1...3.20)
project(Arrangement_on_surface_2_Demo)
if(NOT POLICY CMP0070 AND POLICY CMP0053)

2
Arrangement_on_surface_2/demo/Arrangement_on_surface_2/ColorItemEditor.h
View File

@ -56,7 +56,7 @@ class ColorItemEditor : public QPushButton
Q_PROPERTY(QColor color READ color WRITE setColor USER true)
public:
ColorItemEditor(QWidget *widget = 0);
ColorItemEditor(QWidget *widget = nullptr);
public:
QColor color( ) const;

2
Arrangement_on_surface_2/demo/Arrangement_on_surface_2/NewTabDialog.h
View File

@ -23,7 +23,7 @@ namespace Ui
class NewTabDialog : public QDialog
{
public:
NewTabDialog( QWidget* parent = 0 );
NewTabDialog( QWidget* parent = nullptr );
int checkedId( ) const;
protected:

2
Arrangement_on_surface_2/demo/Arrangement_on_surface_2/PropertyValueDelegate.h
View File

@ -22,7 +22,7 @@ class PropertyValueDelegate : public QItemDelegate
Q_OBJECT
public:
PropertyValueDelegate( QObject* parent = 0 );
PropertyValueDelegate( QObject* parent = nullptr );
public:
QWidget* createEditor( QWidget* parent, const QStyleOptionViewItem& option,

2
Arrangement_on_surface_2/demo/Arrangement_on_surface_2/RationalCurveInputDialog.h
View File

@ -24,7 +24,7 @@ class RationalCurveInputDialog : public QDialog
Q_OBJECT
public:
explicit RationalCurveInputDialog(QWidget *parent = 0);
explicit RationalCurveInputDialog(QWidget *parent = nullptr);
~RationalCurveInputDialog();
std::string getNumeratorText();
std::string getDenominatorText();

2
Arrangement_on_surface_2/demo/Arrangement_on_surface_2/Utils/Utils.cpp
View File

@ -126,7 +126,7 @@ operator()(const Point_2& p, const X_monotone_curve_2& c) const
// AlgKernel ker;
int n = 100;
if (this->scene != NULL && this->scene->views().size() != 0)
if (this->scene != nullptr && this->scene->views().size() != 0)
{ // use the scene to approximate the resolution of the curve
QGraphicsView* view = this->scene->views().first();
CGAL::Bbox_2 bb = c.bbox(); // assumes bounded curve

4
Arrangement_on_surface_2/demo/Arrangement_on_surface_2/VerticalRayGraphicsItem.cpp
View File

@ -185,7 +185,7 @@ void VerticalRayGraphicsItem::modelChanged( )
QRectF VerticalRayGraphicsItem::viewportRect( ) const
{
QRectF res;
if ( this->scene( ) == NULL )
if ( this->scene( ) == nullptr )
{
return res;
}
@ -207,7 +207,7 @@ QRectF VerticalRayGraphicsItem::viewportRect( ) const
void VerticalRayGraphicsItem::drawArrowhead( QPainter* painter,
double targetY, bool isShootingUp )
{
if ( this->scene( ) == 0 || this->scene( )->views( ).size( ) == 0 )
if ( this->scene( ) == nullptr || this->scene( )->views( ).size( ) == 0 )
{
return;
}

2
Arrangement_on_surface_2/examples/Arrangement_on_surface_2/CMakeLists.txt
View File

@ -1,7 +1,7 @@
# Created by the script cgal_create_cmake_script
# This is the CMake script for compiling a CGAL application.
cmake_minimum_required(VERSION 3.1...3.15)
cmake_minimum_required(VERSION 3.1...3.20)
project(Arrangement_on_surface_2_Examples)
find_package(CGAL REQUIRED COMPONENTS Core)

2
Arrangement_on_surface_2/test/Arrangement_on_surface_2/CMakeLists.txt
View File

@ -1,7 +1,7 @@
# Created by the script cgal_create_cmake_script
# This is the CMake script for compiling a CGAL application.
cmake_minimum_required(VERSION 3.1...3.15)
cmake_minimum_required(VERSION 3.1...3.20)
project(Arrangement_on_surface_2_Tests)
enable_testing()

4
Arrangement_on_surface_2/test/Arrangement_on_surface_2/Construction_test.h
View File

@ -172,7 +172,7 @@ Construction_test<T_Geom_traits, T_Topol_traits>::
Construction_test(const Geom_traits& geom_traits) :
Base(geom_traits),
m_geom_traits(geom_traits),
m_arr(NULL),
m_arr(nullptr),
m_verbose_level(0)
{}
@ -188,7 +188,7 @@ void Construction_test<T_Geom_traits, T_Topol_traits>::deallocate_arrangement()
{
if (m_arr) {
delete m_arr;
m_arr = NULL;
m_arr = nullptr;
}
}

2
Arrangement_on_surface_2/test/Arrangement_on_surface_2/IO_base_test.h
View File

@ -1680,7 +1680,7 @@ bool IO_base_test<Base_geom_traits>::read_xcurve(InputStream_& is,
read_point(is, p2);
assert(p1 != p2);
unsigned int flag;
unsigned int flag = static_cast<unsigned int>(-1);
is >> flag;
if (flag == 1) {
X_monotone_curve_2::Direction_3 normal;

18
Arrangement_on_surface_2/test/Arrangement_on_surface_2/Point_location_test.h
View File

@ -252,7 +252,7 @@ private:
template <typename Strategy, Pl_strategy id>
void init_pl(const std::string& name)
{
m_locators[id].m_variant = static_cast<Strategy*>(NULL);
m_locators[id].m_variant = static_cast<Strategy*>(nullptr);
m_locators[id].m_name = name;
m_locators[id].m_active = true;
}
@ -293,7 +293,7 @@ private:
Strategy* strategy = boost::get<Strategy*>(m_locators[id].m_variant);
if (strategy) {
delete strategy;
m_locators[id].m_variant = static_cast<Strategy*>(NULL);
m_locators[id].m_variant = static_cast<Strategy*>(nullptr);
}
}
@ -667,12 +667,12 @@ Point_location_test<GeomTraits, TopolTraits>::
Point_location_test(const Geom_traits& geom_traits) :
Base(geom_traits),
m_geom_traits(geom_traits),
m_arr(NULL),
m_random_g(NULL),
m_grid_g(NULL),
m_halton_g(NULL),
m_middle_edges_g(NULL),
m_specified_points_g(NULL)
m_arr(nullptr),
m_random_g(nullptr),
m_grid_g(nullptr),
m_halton_g(nullptr),
m_middle_edges_g(nullptr),
m_specified_points_g(nullptr)
{
m_locators.resize(NUM_PL_STRATEGIES);
@ -773,7 +773,7 @@ deallocate_arrangement()
{
if (m_arr) {
delete m_arr;
m_arr = NULL;
m_arr = nullptr;
}
}

2
BGL/examples/BGL_LCC/CMakeLists.txt
View File

@ -1,7 +1,7 @@
# Created by the script cgal_create_CMakeLists
# This is the CMake script for compiling a set of CGAL applications.
cmake_minimum_required(VERSION 3.1...3.15)
cmake_minimum_required(VERSION 3.1...3.20)
project(BGL_LCC_Examples)
# CGAL and its components

2
BGL/examples/BGL_LCC/transform_iterator_lcc.cpp
View File

@ -24,7 +24,7 @@ struct Source {
const G* g;
Source()
: g(NULL)
: g(nullptr)
{}
Source(const G& g)

2
BGL/examples/BGL_OpenMesh/CMakeLists.txt
View File

@ -1,7 +1,7 @@
# Created by the script cgal_create_CMakeLists
# This is the CMake script for compiling a set of CGAL applications.
cmake_minimum_required(VERSION 3.1...3.15)
cmake_minimum_required(VERSION 3.1...3.20)
project(BGL_OpenMesh_Examples)
# CGAL and its components

2
BGL/examples/BGL_arrangement_2/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.1...3.15)
cmake_minimum_required(VERSION 3.1...3.20)
project(BGL_arrangement_2_Examples)
find_package(CGAL REQUIRED)

2
BGL/examples/BGL_graphcut/CMakeLists.txt
View File

@ -1,7 +1,7 @@
# Created by the script cgal_create_CMakeLists
# This is the CMake script for compiling a set of CGAL applications.
cmake_minimum_required(VERSION 3.1...3.15)
cmake_minimum_required(VERSION 3.1...3.20)
project(BGL_graphcut_Examples)

2
BGL/examples/BGL_polyhedron_3/CMakeLists.txt
View File

@ -1,7 +1,7 @@
# Created by the script cgal_create_CMakeLists
# This is the CMake script for compiling a set of CGAL applications.
cmake_minimum_required(VERSION 3.1...3.15)
cmake_minimum_required(VERSION 3.1...3.20)
project(BGL_polyhedron_3_Examples)
# CGAL and its components

2
BGL/examples/BGL_polyhedron_3/transform_iterator.cpp
View File

@ -21,7 +21,7 @@ struct Source {
const G* g;
Source()
: g(NULL)
: g(nullptr)
{}
Source(const G& g)

2
BGL/examples/BGL_surface_mesh/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.1...3.15)
cmake_minimum_required(VERSION 3.1...3.20)
project(BGL_surface_mesh_Examples)
find_package(CGAL REQUIRED)

2
BGL/examples/BGL_surface_mesh/surface_mesh_dual.cpp
View File

@ -17,7 +17,7 @@ typedef boost::graph_traits<Dual>::edge_descriptor edge_descriptor;
template <typename G>
struct noborder {
noborder() : g(NULL) {} // default-constructor required by filtered_graph
noborder() : g(nullptr) {} // default-constructor required by filtered_graph
noborder(G& g) : g(&g) {}
bool operator()(const edge_descriptor& e) const

2
BGL/examples/BGL_triangulation_2/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.1...3.15)
cmake_minimum_required(VERSION 3.1...3.20)
project(BGL_triangulation_2_Examples)
find_package(CGAL REQUIRED)

4
BGL/include/CGAL/boost/graph/parameters_interface.h
View File

@ -39,7 +39,6 @@ CGAL_add_named_parameter(face_to_face_map_t, face_to_face_map, face_to_face_map)
CGAL_add_named_parameter(implementation_tag_t, implementation_tag, implementation_tag)
CGAL_add_named_parameter(prevent_unselection_t, prevent_unselection, prevent_unselection)
CGAL_add_named_parameter(stream_precision_t, stream_precision, stream_precision)
CGAL_add_named_parameter(verbose_t, verbose, verbose)
// List of named parameters used for IO
@ -52,6 +51,8 @@ CGAL_add_named_parameter(vertex_color_map_t, vertex_color_map, vertex_color_map)
CGAL_add_named_parameter(vertex_texture_map_t, vertex_texture_map, vertex_texture_map)
CGAL_add_named_parameter(face_color_map_t, face_color_map, face_color_map)
CGAL_add_named_parameter(repair_polygon_soup_t, repair_polygon_soup, repair_polygon_soup)
CGAL_add_named_parameter(output_color_t, output_color, output_color)
CGAL_add_named_parameter(stream_precision_t, stream_precision, stream_precision)
// List of named parameters that we use in the package 'Mesh_3'
CGAL_add_named_parameter(vertex_feature_degree_t, vertex_feature_degree, vertex_feature_degree_map)
@ -120,6 +121,7 @@ CGAL_add_named_parameter(do_not_modify_t, do_not_modify, do_not_modify)
CGAL_add_named_parameter(allow_self_intersections_t, allow_self_intersections, allow_self_intersections)
CGAL_add_named_parameter(non_manifold_feature_map_t, non_manifold_feature_map, non_manifold_feature_map)
CGAL_add_named_parameter(polyhedral_envelope_epsilon_t, polyhedral_envelope_epsilon, polyhedral_envelope_epsilon)
CGAL_add_named_parameter(face_epsilon_map_t, face_epsilon_map, face_epsilon_map)
// List of named parameters that we use in the package 'Surface Mesh Simplification'
CGAL_add_named_parameter(get_cost_policy_t, get_cost_policy, get_cost)

2
BGL/test/BGL/CMakeLists.txt
View File

@ -1,7 +1,7 @@
# Created by the script cgal_create_cmake_script_with_options
# This is the CMake script for compiling a set of CGAL applications.
cmake_minimum_required(VERSION 3.1...3.15)
cmake_minimum_required(VERSION 3.1...3.20)
project(BGL_Tests)
# CGAL and its components

3
BGL/test/BGL/test_cgal_bgl_named_params.cpp
View File

@ -109,6 +109,7 @@ void test(const NamedParameters& np)
assert(get_parameter(np, CGAL::internal_np::maximum_number_of_faces).v == 78910);
assert(get_parameter(np, CGAL::internal_np::non_manifold_feature_map).v == 60);
assert(get_parameter(np, CGAL::internal_np::filter).v == 61);
assert(get_parameter(np, CGAL::internal_np::face_epsilon_map).v == 62);
// Named parameters that we use in the package 'Surface Mesh Simplification'
assert(get_parameter(np, CGAL::internal_np::get_cost_policy).v == 34);
@ -225,6 +226,7 @@ void test(const NamedParameters& np)
check_same_type<78910>(get_parameter(np, CGAL::internal_np::maximum_number_of_faces));
check_same_type<60>(get_parameter(np, CGAL::internal_np::non_manifold_feature_map));
check_same_type<61>(get_parameter(np, CGAL::internal_np::filter));
check_same_type<62>(get_parameter(np, CGAL::internal_np::face_epsilon_map));
// Named parameters that we use in the package 'Surface Mesh Simplification'
check_same_type<34>(get_parameter(np, CGAL::internal_np::get_cost_policy));
@ -353,6 +355,7 @@ int main()
.use_compact_clipper(A<45>(45))
.non_manifold_feature_map(A<60>(60))
.filter(A<61>(61))
.face_epsilon_map(A<62>(62))
.apply_per_connected_component(A<46>(46))
.output_iterator(A<47>(47))
.erase_all_duplicates(A<48>(48))

2
Barycentric_coordinates_2/examples/Barycentric_coordinates_2/CMakeLists.txt
View File

@ -1,7 +1,7 @@
# Created by the script cgal_create_cmake_script
# This is the CMake script for compiling a CGAL application.
cmake_minimum_required(VERSION 3.1...3.15)
cmake_minimum_required(VERSION 3.1...3.20)
project(Barycentric_coordinates_2_Examples)
find_package(CGAL REQUIRED)

2
Barycentric_coordinates_2/test/Barycentric_coordinates_2/CMakeLists.txt
View File

@ -1,7 +1,7 @@
# Created by the script cgal_create_cmake_script
# This is the CMake script for compiling a CGAL application.
cmake_minimum_required(VERSION 3.1...3.15)
cmake_minimum_required(VERSION 3.1...3.20)
project(Barycentric_coordinates_2_Tests)
find_package(CGAL REQUIRED)

2
Boolean_set_operations_2/archive/demo/Boolean_set_operations_2_GraphicsView/CMakeLists.txt
View File

@ -1,7 +1,7 @@
# Created by the script cgal_create_cmake_script
# This is the CMake script for compiling a CGAL application.
cmake_minimum_required(VERSION 3.1...3.15)
cmake_minimum_required(VERSION 3.1...3.20)
project(Boolean_set_operations_2_GraphicsView_Demo)
if(NOT POLICY CMP0070 AND POLICY CMP0053)

2
Boolean_set_operations_2/examples/Boolean_set_operations_2/CMakeLists.txt
View File

@ -1,7 +1,7 @@
# Created by the script cgal_create_cmake_script
# This is the CMake script for compiling a CGAL application.
cmake_minimum_required(VERSION 3.1...3.15)
cmake_minimum_required(VERSION 3.1...3.20)
project(Boolean_set_operations_2_Examples)
find_package(CGAL REQUIRED COMPONENTS Core)

2
Boolean_set_operations_2/test/Boolean_set_operations_2/CMakeLists.txt
View File

@ -1,7 +1,7 @@
# Created by the script cgal_create_cmake_script
# This is the CMake script for compiling a CGAL application.
cmake_minimum_required(VERSION 3.1...3.15)
cmake_minimum_required(VERSION 3.1...3.20)
project(Boolean_set_operations_2_Tests)
find_package(CGAL REQUIRED)

2
Bounding_volumes/examples/Approximate_min_ellipsoid_d/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.1...3.15)
cmake_minimum_required(VERSION 3.1...3.20)
project(Approximate_min_ellipsoid_d_Examples)
find_package(CGAL REQUIRED)

2
Bounding_volumes/examples/Min_annulus_d/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.1...3.15)
cmake_minimum_required(VERSION 3.1...3.20)
project(Min_annulus_d_Examples)
find_package(CGAL REQUIRED)

2
Bounding_volumes/examples/Min_circle_2/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.1...3.15)
cmake_minimum_required(VERSION 3.1...3.20)
project(Min_circle_2_Examples)
find_package(CGAL REQUIRED)

2
Bounding_volumes/examples/Min_ellipse_2/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.1...3.15)
cmake_minimum_required(VERSION 3.1...3.20)
project(Min_ellipse_2_Examples)
find_package(CGAL REQUIRED)

2
Bounding_volumes/examples/Min_quadrilateral_2/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.1...3.15)
cmake_minimum_required(VERSION 3.1...3.20)
project(Min_quadrilateral_2_Examples)
find_package(CGAL REQUIRED)

2
Bounding_volumes/examples/Min_sphere_d/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.1...3.15)
cmake_minimum_required(VERSION 3.1...3.20)
project(Min_sphere_d_Examples)
find_package(CGAL REQUIRED)

2
Bounding_volumes/examples/Min_sphere_of_spheres_d/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.1...3.15)
cmake_minimum_required(VERSION 3.1...3.20)
project(Min_sphere_of_spheres_d_Examples)
find_package(CGAL REQUIRED)

2
Bounding_volumes/examples/Rectangular_p_center_2/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.1...3.15)
cmake_minimum_required(VERSION 3.1...3.20)
project(Rectangular_p_center_2_Examples)
find_package(CGAL REQUIRED)

2
Bounding_volumes/test/Bounding_volumes/CMakeLists.txt
View File

@ -1,7 +1,7 @@
# Created by the script cgal_create_cmake_script
# This is the CMake script for compiling a CGAL application.
cmake_minimum_required(VERSION 3.1...3.15)
cmake_minimum_required(VERSION 3.1...3.20)
project(Bounding_volumes_Tests)
find_package(CGAL REQUIRED COMPONENTS Core)

2
Box_intersection_d/doc/Box_intersection_d/CGAL/box_intersection_d.h
View File

@ -246,7 +246,7 @@ void box_intersection_all_pairs_d(
The first template parameter of the function enables to choose whether
the algorithm is to be run in parallel, if `CGAL::Parallel_tag` is specified
and %CGAL has been linked with the Intel TBB library, or sequentially,
and \cgal has been linked with the Intel TBB library, or sequentially,
if `CGAL::Sequential_tag` - the default value - is specified.
The parallelization of the algorithm is based on a divide-and-conquer
approach: the two ranges are split in a number of smaller ranges, and

2
Box_intersection_d/examples/Box_intersection_d/CMakeLists.txt
View File

@ -1,7 +1,7 @@
# Created by the script cgal_create_cmake_script
# This is the CMake script for compiling a CGAL application.
cmake_minimum_required(VERSION 3.1...3.15)
cmake_minimum_required(VERSION 3.1...3.20)
project(Box_intersection_d_Examples)
find_package(CGAL REQUIRED)

2
Box_intersection_d/test/Box_intersection_d/CMakeLists.txt
View File

@ -1,7 +1,7 @@
# Created by the script cgal_create_cmake_script
# This is the CMake script for compiling a CGAL application.
cmake_minimum_required(VERSION 3.1...3.15)
cmake_minimum_required(VERSION 3.1...3.20)
project(Box_intersection_d_Tests)
find_package(CGAL REQUIRED)

2
CGAL_Core/examples/Core/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.1...3.15)
cmake_minimum_required(VERSION 3.1...3.20)
project(Core_Examples)
# CGAL and its components

8
CGAL_ImageIO/archive/demo/CGALimageIO/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.1...3.15)
cmake_minimum_required(VERSION 3.1...3.20)
project(CGALimageIO_Demo)
if(NOT POLICY CMP0070 AND POLICY CMP0053)
@ -30,8 +30,8 @@ if(VTK_FOUND)
if(TARGET vtkRenderingQt AND TARGET vtkFiltersModeling)
find_package(VTK COMPONENTS vtkRenderingQt vtkFiltersModeling NO_MODULE)
include(${VTK_USE_FILE})
find_package(Qt${VTK_QT_VERSION} COMPONENTS QtGui)
if(NOT TARGET Qt${VTK_QT_VERSION}::QtGui)
find_package(Qt${VTK_QT_VERSION} COMPONENTS Gui)
if(NOT TARGET Qt${VTK_QT_VERSION}::Gui)
message(
STATUS
"NOTICE: vtkRenderingQt needs Qt${VTK_QT_VERSION}, and will not be compiled."
@ -44,7 +44,7 @@ if(VTK_FOUND)
target_link_libraries(
image_to_vtk_viewer ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES}
${VTK_LIBRARIES} Qt${VTK_QT_VERSION}::QtGui)
${VTK_LIBRARIES} Qt${VTK_QT_VERSION}::Gui)
else()
message(
STATUS

3
CGAL_ImageIO/examples/CGALimageIO/CMakeLists.txt
View File

@ -1,7 +1,7 @@
# Created by the script cgal_create_cmake_script
# This is the CMake script for compiling a CGAL application.
cmake_minimum_required(VERSION 3.1...3.15)
cmake_minimum_required(VERSION 3.1...3.20)
project(CGALimageIO_Examples)
if(POLICY CMP0074)
@ -16,6 +16,7 @@ if(CGAL_ImageIO_FOUND)
create_single_source_cgal_program("convert_raw_image_to_inr.cpp")
create_single_source_cgal_program("test_imageio.cpp")
create_single_source_cgal_program("extract_a_sub_image.cpp")
create_single_source_cgal_program("slice_image.cpp")
else()
message(
STATUS

2
CGAL_ImageIO/examples/CGALimageIO/extract_a_sub_image.cpp
View File

@ -33,7 +33,7 @@ int main(int argc, char **argv) {
for (auto k = zmin; k < zmax; ++k)
for (auto j = ymin; j <= ymax; ++j)
for (auto i = xmin; i <= xmax; ++i) {
auto pos = data + image->wdim * (i + image->xdim * (j + image->zdim * k));
auto pos = data + image->wdim * (i + image->xdim * (j + image->ydim * k));
std::copy(pos, pos + image->wdim, new_data);
new_data += image->wdim;
}

27
CGAL_ImageIO/examples/CGALimageIO/slice_image.cpp Normal file
View File

@ -0,0 +1,27 @@
#include <CGAL/ImageIO.h>
#include <iostream>
#include <string>
int main(int argc, char **argv) {
if (argc != 3) {
std::cerr << "Usage: slice_size <input> <output>\n";
return argc != 1;
}
_image *image = ::_readImage(argv[1]);
if (!image)
return 2;
auto *new_image = ::_createImage(image->xdim, image->ydim, image->zdim / 2 + 1, 1,
image->vx, image->vy, image->vz*2, image->wdim,
image->wordKind, image->sign);
const auto* const data = static_cast<char*>(image->data);
auto* new_data = static_cast<char*>(new_image->data);
const auto slice_size = image->wdim * image->xdim * image->ydim;
for (auto k = 0ul; k < image->zdim; k+=2) {
auto pos = data + slice_size * k;
new_data = std::copy(pos, pos + slice_size, new_data);
}
auto r = ::_writeImage(new_image, argv[2]);
if(r != ImageIO_NO_ERROR) return 3;
::_freeImage(image);
::_freeImage(new_image);
}

3
CGAL_ImageIO/include/CGAL/Image_3_vtk_interface.h
View File

@ -110,6 +110,9 @@ struct VTK_type_generator<boost::uint32_t> {
vtk_image->SetSpacing(image.vx(),
image.vy(),
image.vz());
vtk_image->SetOrigin(image.tx(),
image.ty(),
image.tz());
vtk_image->AllocateScalars(type, 1);
vtk_image->GetPointData()->SetScalars(data_array);
return vtk_image;

2
CGAL_ImageIO/test/CGAL_ImageIO/CMakeLists.txt
View File

@ -1,7 +1,7 @@
# Created by the script cgal_create_cmake_script
# This is the CMake script for compiling a CGAL application.
cmake_minimum_required(VERSION 3.1...3.15)
cmake_minimum_required(VERSION 3.1...3.20)
project(CGAL_ImageIO_Tests)
if(POLICY CMP0074)

2
CGAL_ImageIO/test/CGAL_ImageIO/test_trilinear_interpolation.cpp
View File

@ -188,7 +188,7 @@ int main() {
<< "timer new implementation: " << timer_new_implementation.time()
<< "\ntimer old implementation: " << timer_old_implementation.time()
<< "\n";
image.set_data(0); // trick to avoid ~Image_3 segfault.
image.set_data(nullptr); // trick to avoid ~Image_3 segfault.
const char* filenames[] = {

2
CGAL_ipelets/demo/CGAL_ipelets/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.1...3.15)
cmake_minimum_required(VERSION 3.1...3.20)
project(CGAL_ipelets_Demo)
if(NOT POLICY CMP0070 AND POLICY CMP0053)

2
CGAL_ipelets/demo/CGAL_ipelets/mst.cpp
View File

@ -37,7 +37,7 @@ template <typename T>
struct Is_finite {
const T* t_;
Is_finite()
: t_(NULL)
: t_(nullptr)
{}
Is_finite(const T& t)
: t_(&t)

2
CGAL_ipelets/examples/CGAL_ipelets/CMakeLists.txt
View File

@ -1,7 +1,7 @@
# Created by the script cgal_create_cmake_script
# This is the CMake script for compiling a CGAL application.
cmake_minimum_required(VERSION 3.1...3.15)
cmake_minimum_required(VERSION 3.1...3.20)
project(CGAL_ipelets_Examples)
find_package(CGAL REQUIRED)

3
CMakeLists.txt
View File

@ -1,10 +1,9 @@
# Top level CMakeLists.txt for CGAL-branchbuild
# Minimal version of CMake:
cmake_minimum_required(VERSION 3.1)
cmake_minimum_required(VERSION 3.1...3.20)
message("== CMake setup ==")
cmake_minimum_required(VERSION 3.1...3.15)
project(CGAL CXX C)
export(PACKAGE CGAL)

6
Cartesian_kernel/include/CGAL/Cartesian/function_objects.h
View File

@ -3692,9 +3692,9 @@ namespace CartesianKernelFunctors {
// p,q,r supposed to be non collinear
// tests whether s is on the same side of p,q as r
// returns :
// COLLINEAR if pqr collinear
// POSITIVE if qrp and qrs have the same orientation
// NEGATIVE if qrp and qrs have opposite orientations
// COLLINEAR if qps collinear
// POSITIVE if qpr and qps have the same orientation
// NEGATIVE if qpr and qps have opposite orientations
CGAL_kernel_exactness_precondition( ! cl(p, q, r) );
CGAL_kernel_exactness_precondition( cp(p, q, r, s) );
return coplanar_orientationC3(p.x(), p.y(), p.z(),

20
Cartesian_kernel/include/CGAL/predicates/kernel_ftC2.h
View File

@ -55,10 +55,10 @@ equal_lineC2(const FT &l1a, const FT &l1b, const FT &l1c,
return false; // Not parallel.
typename Sgn<FT>::result_type s1a = CGAL_NTS sign(l1a);
if (s1a != ZERO)
return s1a == CGAL_NTS sign(l2a)
&& sign_of_determinant(l1a, l1c, l2a, l2c) == ZERO;
return CGAL_NTS sign(l1b) == CGAL_NTS sign(l2b)
&& sign_of_determinant(l1b, l1c, l2b, l2c) == ZERO;
return CGAL_AND(s1a == CGAL_NTS sign(l2a),
sign_of_determinant(l1a, l1c, l2a, l2c) == ZERO);
return CGAL_AND(CGAL_NTS sign(l1b) == CGAL_NTS sign(l2b),
sign_of_determinant(l1b, l1c, l2b, l2c) == ZERO);
}
template < class FT >
@ -230,7 +230,7 @@ compare_y_at_x_segment_C2(const FT &px,
CGAL_kernel_precondition(are_ordered(s1sx, px, s1tx));
CGAL_kernel_precondition(are_ordered(s2sx, px, s2tx));
if (s1sx != s1tx && s2sx != s2tx) {
if (CGAL_AND(s1sx != s1tx, s2sx != s2tx)) {
FT s1stx = s1sx-s1tx;
FT s2stx = s2sx-s2tx;
@ -265,9 +265,9 @@ typename Equal_to<FT>::result_type
equal_directionC2(const FT &dx1, const FT &dy1,
const FT &dx2, const FT &dy2)
{
return CGAL_NTS sign(dx1) == CGAL_NTS sign(dx2)
&& CGAL_NTS sign(dy1) == CGAL_NTS sign(dy2)
&& sign_of_determinant(dx1, dy1, dx2, dy2) == ZERO;
return CGAL_AND_3( CGAL_NTS sign(dx1) == CGAL_NTS sign(dx2),
CGAL_NTS sign(dy1) == CGAL_NTS sign(dy2),
sign_of_determinant(dx1, dy1, dx2, dy2) == ZERO );
}
template < class FT >
@ -391,7 +391,9 @@ typename Compare<FT>::result_type
compare_lexicographically_xyC2(const FT &px, const FT &py,
const FT &qx, const FT &qy)
{
typename Compare<FT>::result_type c = CGAL_NTS compare(px,qx);
typedef typename Compare<FT>::result_type Cmp;
Cmp c = CGAL_NTS compare(px,qx);
if (is_indeterminate(c)) return indeterminate<Cmp>();
return (c != EQUAL) ? c : CGAL_NTS compare(py,qy);
}

22
Cartesian_kernel/include/CGAL/predicates/kernel_ftC3.h
View File

@ -61,8 +61,10 @@ compare_lexicographically_xyzC3(const FT &px, const FT &py, const FT &pz,
{
typedef typename Compare<FT>::result_type Cmp;
Cmp c = CGAL_NTS compare(px, qx);
if (is_indeterminate(c)) return indeterminate<Cmp>();
if (c != EQUAL) return c;
c = CGAL_NTS compare(py, qy);
if (is_indeterminate(c)) return indeterminate<Cmp>();
if (c != EQUAL) return c;
return CGAL_NTS compare(pz, qz);
}
@ -288,12 +290,12 @@ typename Equal_to<FT>::result_type
equal_directionC3(const FT &dx1, const FT &dy1, const FT &dz1,
const FT &dx2, const FT &dy2, const FT &dz2)
{
return sign_of_determinant(dx1, dy1, dx2, dy2) == ZERO
&& sign_of_determinant(dx1, dz1, dx2, dz2) == ZERO
&& sign_of_determinant(dy1, dz1, dy2, dz2) == ZERO
&& CGAL_NTS sign(dx1) == CGAL_NTS sign(dx2)
&& CGAL_NTS sign(dy1) == CGAL_NTS sign(dy2)
&& CGAL_NTS sign(dz1) == CGAL_NTS sign(dz2);
return CGAL_AND_6(sign_of_determinant(dx1, dy1, dx2, dy2) == ZERO,
sign_of_determinant(dx1, dz1, dx2, dz2) == ZERO,
sign_of_determinant(dy1, dz1, dy2, dz2) == ZERO,
CGAL_NTS sign(dx1) == CGAL_NTS sign(dx2),
CGAL_NTS sign(dy1) == CGAL_NTS sign(dy2),
CGAL_NTS sign(dz1) == CGAL_NTS sign(dz2) );
}
template < class FT >
@ -313,10 +315,10 @@ equal_planeC3(const FT &ha, const FT &hb, const FT &hc, const FT &hd,
sign_of_determinant(pa, pd, ha, hd) == ZERO );
Sg s1b = CGAL_NTS sign(hb);
if (s1b != ZERO)
return s1b == CGAL_NTS sign(pb)
&& sign_of_determinant(pb, pd, hb, hd) == ZERO;
return CGAL_NTS sign(pc) == CGAL_NTS sign(hc)
&& sign_of_determinant(pc, pd, hc, hd) == ZERO;
return CGAL_AND(s1b == CGAL_NTS sign(pb),
sign_of_determinant(pb, pd, hb, hd) == ZERO );
return CGAL_AND( CGAL_NTS sign(pc) == CGAL_NTS sign(hc),
sign_of_determinant(pc, pd, hc, hd) == ZERO );
}
template <class FT >

2
Circular_kernel_2/examples/Circular_kernel_2/CMakeLists.txt
View File

@ -1,7 +1,7 @@
# Created by the script cgal_create_cmake_script
# This is the CMake script for compiling a CGAL application.
cmake_minimum_required(VERSION 3.1...3.15)
cmake_minimum_required(VERSION 3.1...3.20)
project(Circular_kernel_2_Examples)
find_package(CGAL REQUIRED)

2
Circular_kernel_2/test/Circular_kernel_2/CMakeLists.txt
View File

@ -1,7 +1,7 @@
# Created by the script cgal_create_cmake_script
# This is the CMake script for compiling a CGAL application.
cmake_minimum_required(VERSION 3.1...3.15)
cmake_minimum_required(VERSION 3.1...3.20)
project(Circular_kernel_2_Tests)
find_package(CGAL REQUIRED)

2
Circular_kernel_3/demo/Circular_kernel_3/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.1...3.15)
cmake_minimum_required(VERSION 3.1...3.20)
project(Circular_kernel_3_Demo)
if(NOT POLICY CMP0070 AND POLICY CMP0053)

6
Circular_kernel_3/demo/Circular_kernel_3/Viewer.cpp
View File

@ -295,9 +295,6 @@ void Viewer::initialize_buffers()
buffers[6].release();
}
vao[2].release();
}
void Viewer::compute_elements()
@ -841,7 +838,6 @@ void Viewer::draw()
rendering_program.release();
vao[1].release();
}
void Viewer::init()
@ -906,7 +902,7 @@ void Viewer::naive_compute_intersection_points(const std::vector<EPIC::Point_3>&
for (std::vector <CGAL::Object>::const_iterator it_pt=intersections.begin();it_pt!=intersections.end();++it_pt){
const std::pair<SK::Circular_arc_point_3,unsigned>* pt=
CGAL::object_cast< std::pair<SK::Circular_arc_point_3,unsigned> > (&(*it_pt));
assert(pt!=NULL);
assert(pt!=nullptr);
*out++=EPIC::Point_3( CGAL::to_double(pt->first.x()),
CGAL::to_double(pt->first.y()),
CGAL::to_double(pt->first.z())

2
Circular_kernel_3/demo/Circular_kernel_3/Viewer.h
View File

@ -12,7 +12,7 @@ typedef CGAL::Exact_predicates_inexact_constructions_kernel EPIC;
class Viewer : public CGAL::QGLViewer
{
public:
Viewer(QWidget* parent = 0);
Viewer(QWidget* parent = nullptr);
~Viewer();
GLuint dl_nb;
protected :

2
Circular_kernel_3/examples/Circular_kernel_3/CMakeLists.txt
View File

@ -1,7 +1,7 @@
# Created by the script cgal_create_cmake_script
# This is the CMake script for compiling a CGAL application.
cmake_minimum_required(VERSION 3.1...3.15)
cmake_minimum_required(VERSION 3.1...3.20)
project(Circular_kernel_3_Examples)
find_package(CGAL REQUIRED)

Some files were not shown because too many files have changed in this diff Show More