Commit Graph

501 Commits

Author SHA1 Message Date
Sébastien Loriot 0779373835 extra run of the script to remove tabs and trailing whitespaces
right after the  merge of 4.14 release branch

+ manual fix on one line in:
    * Arrangement_on_surface_2/include/CGAL/IO/Arr_text_formatter.h
    * .travis/generate_travis.sh
2020-03-26 14:16:06 +01:00
Sébastien Loriot 0a46621dc6 Merge branch 'cgal/releases/CGAL-4.14-branch'
whitespace+tab removal, merged with option -Xignore-all-space
2020-03-26 13:28:46 +01:00
Sébastien Loriot 590612a563 run the script to remove tabs and trailing whitespaces 2020-03-26 13:25:16 +01:00
Sébastien Loriot d10359d09e Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch' 2020-03-19 16:27:55 +01:00
Sebastien Loriot e53018d11e
Merge pull request #4565 from MaelRL/Tr-construct_point_return-GF
Triangulation_23: Grab return of construct_point() by reference when possible
2020-03-19 16:25:31 +01:00
Sébastien Loriot cf99ea072d Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch' 2020-03-16 16:19:38 +01:00
Mael Rouxel-Labbé 57465431e8 Fix grammar 2020-03-10 15:26:34 +01:00
Mael Rouxel-Labbé fe7c4629c1 Tiny punctuation change 2020-03-10 15:20:16 +01:00
Mael Rouxel-Labbé 0729d1b0d1 Update documentations of SDG/AG2: Filtered_exact has been removed...
... 16 years ago !
2020-03-10 15:17:50 +01:00
Mael Rouxel-Labbé 2cfad7b991 Add Construct_point_2 to SDG2 traits models
The traits is supposed to be a model of a concept which refines
TriangulationTraits2, which demands a model of ConstructPoint_2,
so it should have been there.
2020-03-10 12:24:31 +01:00
Sébastien Loriot 254d60f642 First pass on removing license notice in header for GPL files 2019-10-19 15:23:19 +02:00
Sébastien Loriot 7356421d80 introduce Commercial license SPDX tag 2019-10-19 12:15:19 +02:00
Sébastien Loriot 9bd9c68b83 update LGPL[23]+ and GPL[23]+ SPDX tags
ack -l --no-svg "SPDX-License-Identifier: GPL-3.0\+" | xargs sed -i "s/SPDX-License-Identifier: GPL-3.0+/SPDX-License-Identifier: GPL-3.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-3.0\+" | xargs sed -i "s/SPDX-License-Identifier: LGPL-3.0+/SPDX-License-Identifier: LGPL-3.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: GPL-2.0\+" | xargs sed -i "s/SPDX-License-Identifier: GPL-2.0+/SPDX-License-Identifier: GPL-2.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-2.0\+" | xargs sed -i "s/SPDX-License-Identifier: LGPL-2.0+/SPDX-License-Identifier: LGPL-2.0-or-later/"
2019-10-18 21:57:54 +02:00
Laurent Rineau 7b1889b87e Merge branch 'releases/CGAL-4.14-branch'
# Conflicts:
#	Point_set_processing_3/include/CGAL/IO/write_ply_points.h
2019-07-26 18:45:17 +02:00
Laurent Rineau da2726e0e7 Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch
# Conflicts:
#	CGAL_ipelets/include/CGAL/CGAL_Ipelet_base_v7.h
#	Installation/lib/cmake/CGAL/CGALConfig.cmake
#	Intersections_2/test/Intersections_2/test_intersections_2.cpp
#	Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/include/test_types.h
#	Snap_rounding_2/include/CGAL/Snap_rounding_kd_2.h
2019-07-26 18:33:55 +02:00
Maxime Gimeno 036b3efb9a Actually fix the bug 2019-07-23 10:11:53 +02:00
Sebastien Loriot e4adb62011
Merge pull request #4078 from maxGimeno/Fix_some_warnings-GF
Fix warnings
2019-07-18 16:35:51 +02:00
Maxime Gimeno d3d996d18e Fix warning in SDG 2019-07-16 11:40:09 +02:00
Maxime Gimeno 64253458aa Fix warnings 2019-07-12 10:49:10 +02:00
Sébastien Loriot fbafb9d06f fix remaining mismatches and fix bugs 2019-07-10 11:40:45 +02:00
Sébastien Loriot 983645a51a match @{ and @} 2019-07-05 21:49:46 +02:00
Laurent Rineau 32f80cbece Merge pull request #4018 from lrineau/CGAL-refresh_cmake_minimum_required-GF
CMake>=3.13: opt for for new policies up to 3.15
2019-07-01 11:16:30 +02:00
Laurent Rineau b18a17eba7 Merge branch 'releases/CGAL-4.14-branch'
# Conflicts:
#	Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Corefinement/Face_graph_output_builder.h
2019-07-01 11:13:42 +02:00
Laurent Rineau 3782c024df Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch 2019-07-01 11:06:57 +02:00
Mael Rouxel-Labbé f882c5d3a6 Sanitize result of square root 2019-06-26 15:09:19 +02:00
Laurent Rineau 8535a3c03c Merge branch 'releases/CGAL-4.14-branch'
# Conflicts:
#	Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Apollonius_graph_2_impl.h
#	Convex_hull_3/include/CGAL/convex_hull_3.h
#	Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Corefinement/face_graph_utils.h
#	Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Mesh_3_plugin_cgal_code.cpp
#	Stream_support/include/CGAL/IO/Color.h
2019-06-20 14:20:37 +02:00
Laurent Rineau b0f1f90a4d Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch 2019-06-20 14:08:25 +02:00
Laurent Rineau 4fbf00fb8a CMake>=3.13: opt for for new policies up to 3.15 2019-06-19 14:34:59 +02:00
Mael Rouxel-Labbé 51333214c0 Derecursify SDG_2::expand_conflict_region_remove() 2019-06-18 13:18:51 +02:00
Mael Rouxel-Labbé 4e15225e98 Derecursify 'expand_conflict_region' 2019-06-18 11:04:09 +02:00
Laurent Rineau 8837c161ef Merge pull request #3958 from afabri/SDG_2-improve_doc-GF
Segment_Delaunay_graph_2: Improve documentation
2019-06-17 14:16:00 +02:00
Laurent Rineau be0d07d150 Merge pull request #3979 from afabri/CGAL-null_ptr-GF
Replace NULL and Nullptr_t with nullptr and nullptr_t
2019-06-17 14:10:35 +02:00
Laurent Rineau 96912aaa20 Merge branch 'releases/CGAL-4.14-branch' 2019-06-17 13:53:42 +02:00
Laurent Rineau 085abe17ae Merge pull request #3934 from sloriot/SDG2-fix_edge_in_conflict
Fix the in-conflict of Voronoi edge
2019-06-17 13:51:41 +02:00
Laurent Rineau 0626dc7892 Merge pull request #3934 from sloriot/SDG2-fix_edge_in_conflict
Fix the in-conflict of Voronoi edge
2019-06-17 13:48:15 +02:00
Andreas Fabri 5141c6d95d Fix wording in SVD User Manaul 2019-06-11 12:54:34 +02:00
Andreas Fabri e2d19b0c8d Replace NULL and Nullptr_t with nullptr and nullptr_t 2019-06-04 23:45:44 +02:00
Andreas Fabri 8131d4efda Fix order of documentation of template parameters 2019-05-26 18:14:24 +02:00
Andreas Fabri d4584ba983 Fix typos 2019-05-26 11:54:11 +02:00
Laurent Rineau 7e58feacfe Merge pull request #3797 from afabri/CGAL-Exact_algebraic-GF
Number_types:  Add Exact_algebraic
2019-05-21 16:37:07 +02:00
Laurent Rineau e4c82fa260 Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch 2019-05-21 16:35:24 +02:00
Sébastien Loriot e2a3f66201 add missing include directive 2019-05-15 15:32:55 +02:00
Sébastien Loriot a588d1a3a4 add more test cases 2019-05-15 15:07:23 +02:00
Sébastien Loriot cd4554b26f fix the in-conflict of Voronoi edge in the case the new point is on the Voronoi circle of endpoints
in this special case, the circles are identical because the defining sites are the same
2019-05-15 08:28:31 +02:00
Sébastien Loriot db0fe89b0c fix the init of the vertex index vector 2019-05-14 09:06:12 +02:00
Andreas Fabri ca301e95a9 The divide is only needed for drawing purposes so we call to_double
in case the number type is a ring type
2019-05-03 12:13:50 +02:00
Andreas Fabri c738d89aca I think that the typedef SDG SDG2; has to be moved. Currently SDG2 comes from the .cpp testfile
Also do not draw for the moment as the division happens there.
2019-05-02 13:34:08 +02:00
Andreas Fabri 3b65d79b11 Fix Segment_Delaunay_graph_2 2019-03-26 11:35:38 +01:00
Andreas Fabri a622a4c70b Fix Segment_Delaunay_graph_2 2019-03-26 11:27:56 +01:00
Andreas Fabri 3ca138239c Use Exact_rational and Exact_algebraic instead of hardwired CORE. Todo: Fix CMakeList.txt 2019-03-26 10:24:57 +01:00