Commit Graph

223 Commits

Author SHA1 Message Date
Sebastien Loriot 98fafe4ef1
Merge pull request #4514 from MaelRL/CGAL-Fix_warnings-GF
Fix (some) testuite warnings
2020-04-16 18:15:11 +02:00
Sébastien Loriot 9a17c8d9fa Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch' 2020-04-16 16:28:01 +02:00
Sébastien Loriot 1c3d644b3c use Exact_field_selector 2020-04-14 17:45:02 +02:00
Maxime Gimeno 980adeb5b2 Fix warning in sdg2 2020-04-09 13:47:17 +02:00
Mael Rouxel-Labbé cc18ed332c Fix a warning in SDG2/SDG_Linf_2
The call to source() (resp. target()) is a call to compute_source()
(resp. compute_target()) which cofuses the compiler because it does
not know that the site being considered here is known to be
an input site, for which these computations involving uninitiliazed
data cannot take place.

The functions source/target_of_supporting_site() directly return
what source()/target() return in the case of an input site.

For some reason the compiler doesn't complain about point(), which
should do the same. One could use source_of_supporting_site
since it returns p_[0] (which is what we want when we call
site.point() with an input site), but it would be confusing,
for readers this time.
2020-04-06 18:33:26 +02:00
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 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
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
Maxime Gimeno 64253458aa Fix warnings 2019-07-12 10:49:10 +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
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 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 e2d19b0c8d Replace NULL and Nullptr_t with nullptr and nullptr_t 2019-06-04 23:45:44 +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 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
Laurent Rineau afc3de2894
Merge branch 'master' into Stream_support-Color-GF 2019-01-23 09:37:08 +01:00
Andreas Fabri 1c21a80e61 Fix SDG_Linf 2019-01-15 18:44:49 +01:00
Marc Glisse 7a29f58df5 Specify the parameter of determinant, because of expression templates. 2019-01-12 00:52:51 +01:00
Andreas Fabri bb76e5193c Fix SVD 2019-01-10 18:05:29 +01:00
Mael Rouxel-Labbé 26c857a431 Moved unary/binary_function to CGAL::cpp98 2018-06-13 15:58:19 +02:00
Andreas Fabri c54a6a4980 Put CGAL::random_shuffle() in the subnamespace cpp98 2018-04-11 09:32:23 +01:00
Andreas Fabri 063a91a771 Use CGAL::random_shuffle 2018-04-04 14:00:23 +01:00
Sébastien Loriot 483f69728e Refresh branch 2018-02-12 22:21:38 +01:00
Simon Giraudot 6269309d86 Use CGAL include for boost counting/transform iterators everywhere 2018-01-23 11:09:52 +01:00
Andreas Fabri 341d2bb249 Segment_voronoi 2018-01-18 10:27:53 +00:00
Sébastien Loriot ee57fc2d6c add SPDX identifier for files under the GPL-3+ license 2017-11-12 10:17:51 +01:00
Laurent Rineau 8f46324806 Merge pull request #2475 from sgiraudot/Fix_counting_iterator_warning_everywhere-GF
Fix counting iterator warnings
2017-10-11 19:15:15 +02:00
Laurent Rineau 2b35bddfb2 Replace all std::binary_function by CGAL::binary_function 2017-10-04 16:36:32 +02:00
Laurent Rineau 7e9f756935 Replace all std::unary_function by CGAL::unary_function 2017-10-04 15:57:09 +02:00
Simon Giraudot 1e7b9ea027 Fix counting iterator warnings 2017-09-29 14:47:17 +02:00
Mael Rouxel-Labbé e0bdb6a9ac SDG vertex base must define a Point type to satisfy TriangulationVertexBase_2 2017-06-28 10:15:30 +02:00
Andreas Fabri dfb37af958 test dependencies in Mesh_2 2017-04-06 13:16:35 +02:00
Jane Tournois df47a35e67 fix more conversion warnings for msvc 2017 2017-02-14 12:00:05 +01:00
Sébastien Loriot 50510c05ea add include directive for license of all GPL header files
done using:
ack-grep "^GPL" */package_info/*/license.txt -l | awk -F "/" '{print $1}' > /tmp/gpl_packages
for i in `cat /tmp/gpl_packages | \
          grep -v Operations_on_polyhedra | \
          grep -v Algebraic_kernel_for_circles | \
          grep -v Algebraic_kernel_for_spheres | \
          grep -v Polyhedron_IO`;
do
  echo $i
  python Scripts/developer_scripts/add_license_in_pkg_header.py $i
done
python Scripts/developer_scripts/add_license_in_pkg_header.py Operations_on_polyhedra Polygon_mesh_processing
python Scripts/developer_scripts/add_license_in_pkg_header.py Algebraic_kernel_for_circles Circular_kernel_2
python Scripts/developer_scripts/add_license_in_pkg_header.py Algebraic_kernel_for_spheres Circular_kernel_3
python Scripts/developer_scripts/add_license_in_pkg_header.py Polyhedron_IO Polyhedron
2017-01-19 15:20:25 +01:00