Commit Graph

86547 Commits

Author SHA1 Message Date
Mael Rouxel-Labbé 26ecd80237 Increase tolerance furthermore + temporary debug code 2019-07-09 16:21:06 +02:00
Mael Rouxel-Labbé f7576c709b Disable test of PMP::Locate with 2D Surface Mesh until Surface_Mesh IO is fixed 2019-07-08 16:03:31 +02:00
Mael Rouxel-Labbé 97626d2c34 Revert "Re-enable using operator<< and operator>> with 2D meshes"
This reverts commit bc32291d36.

This will be cleaned in a better way in the future.
2019-07-08 15:58:36 +02:00
Mael Rouxel-Labbé f03c3bf129 Sanitize values for 32 bit platforms 2019-07-03 09:07:57 +02:00
Mael Rouxel-Labbé c4489f9a96 Revert bad stowaway changes sneaking in through a branch update 2019-07-02 09:25:45 +02:00
Mael Rouxel-Labbé f68141a6d3 Merge branch 'PMP-Locate-GF-old' into PMP-Locate-GF 2019-07-01 11:28:25 +02:00
Laurent Rineau 44e4d1526c Fix the CHANGES.md 2019-07-01 11:22:46 +02:00
Laurent Rineau a99269d91d Merge pull request #3410 from maxGimeno/Kernel_23-Add_suport_for_reflextions-GF
Aff_transformation_2: Add suport for reflections
2019-07-01 11:16:36 +02:00
Laurent Rineau 39a245220a Merge pull request #3660 from mglisse/NewKernel_d-lazy_Epeck_d-glisse
Epeck_d
2019-07-01 11:16:33 +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 dbb1cb6c9b Merge pull request #3974 from afabri/Triangulation-add_ranges-GF
Triangulation_{2,3):  Add ranges
2019-07-01 11:16:05 +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 64bc06e2d9 Merge pull request #4032 from sloriot/PMP-coref_invalid_map
Fix copy/paste error
2019-07-01 11:07:29 +02:00
Laurent Rineau a2f57a7ded Merge pull request #4037 from MaelRL/Intersections_2-Fix_typename-GF
Intersections_2: remove superfluous 'typename's
2019-07-01 11:07:26 +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
Laurent Rineau 495b3264c9 Merge pull request #4035 from MaelRL/SDG-Band_aid_for_SQRTless_CK-GF
SDG: Sanitize input of square root in evaluation of nested extensions
2019-07-01 11:06:30 +02:00
Laurent Rineau 0ec8edbe07 Merge pull request #4039 from sloriot/PMP-fix_marks_removal
update marks on removed edges
2019-07-01 11:06:27 +02:00
Mael Rouxel-Labbé ee99c92972 Sanitize values to please 32 bit platforms 2019-07-01 09:14:04 +02:00
Laurent Rineau 891a28dbaa Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch'
# Conflicts:
#	Triangulation_2/test/Triangulation_2/issue_4010.cpp
2019-06-28 10:41:55 +02:00
Laurent Rineau 54bd82ea93
Merge pull request #4036 from afabri/Triangulation_2-fix_issue_4010-FD
Triangulation_2: Do not use C++11
2019-06-28 10:39:56 +02:00
Sébastien Loriot df9a63b2b4 update marks on removed edges 2019-06-27 08:44:46 +02:00
Mael Rouxel-Labbé c78f1ef812 Remove superfluous 'typename's 2019-06-26 15:57:32 +02:00
Mael Rouxel-Labbé 1791870f4c Fix warning 2019-06-26 15:51:27 +02:00
Andreas Fabri a9bd8226bc Do not use C++11 2019-06-26 15:35:11 +02:00
Mael Rouxel-Labbé f882c5d3a6 Sanitize result of square root 2019-06-26 15:09:19 +02:00
Sébastien Loriot 4e1e7d8c16 fix wrong index 2019-06-26 10:52:48 +02:00
Laurent Rineau e3cbd08a5f Merge branch 'releases/CGAL-4.14-branch' 2019-06-26 09:49:59 +02:00
Mael Rouxel-Labbé 2729098c29 Update CHANGES.md 2019-06-26 08:42:23 +02:00
Mael Rouxel-Labbé d3882274e5 Change test values to be compatible with 32 bit platforms 2019-06-26 08:12:17 +02:00
Mael 6d7b5ed8da
Renumber NP in test to smooth testing
Another PR is also adding new named parameters
2019-06-25 19:07:32 +02:00
Mael Rouxel-Labbé 40aae43c5d Fix warning 2019-06-25 09:21:31 +02:00
Laurent Rineau 11e634246a Make this PR compatible with https://github.com/CGAL/cgal/pull/3939 2019-06-24 10:19:52 +02:00
Mael Rouxel-Labbé 6f42e4be15 Fix warning 2019-06-24 08:16:01 +02:00
Laurent Rineau 26f2efae06
Triangulation_2: Fix CDT_plus_2::remove_constraint() (#4020)
Triangulation_2: Fix CDT_plus_2::remove_constraint()
2019-06-21 15:28:07 +02:00
Laurent Rineau 6ad4b3934e Merge branch 'releases/CGAL-4.14-branch' 2019-06-21 10:34:35 +02:00
Laurent Rineau 55c9a175b5 Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch 2019-06-21 10:34:18 +02:00
bryantcurto 056e846e0d Fixed do_intersect() ambiguity.
Occurs when compiling with clang
2019-06-21 10:33:46 +02:00
Mael Rouxel-Labbé 7a5486962d Merge branch 'PMP-Locate-GF-old' into PMP-Locate-GF 2019-06-20 14:49:25 +02:00
Laurent Rineau a236d22e2d Merge pull request #3730 from sloriot/CGAL-create_tarballs
Add an option to create tarballs while creating a release
2019-06-20 14:21:16 +02:00
Laurent Rineau 17add8332e Merge pull request #3903 from MaelRL/PMP-Generalize_keep_largest_CC-GF
PMP: Generalize `keep_large(st)_CCs`
2019-06-20 14:21:14 +02:00
Laurent Rineau 33e7de45e9 Merge pull request #3919 from maxGimeno/Add_3mf_wrapper-GF
Stream_support: Add a 3mf wrapper
2019-06-20 14:21:11 +02:00
Laurent Rineau 8fd3f2d8fd Merge pull request #3973 from sgiraudot/Kernel_23-Add_hash_functions-GF
[Small Feature] Add hash functions for kernel objects
2019-06-20 14:21:09 +02:00
Laurent Rineau 53ba851c89 Merge pull request #3990 from bryantcurto/patch-1
do_intersect() Ambiguity
2019-06-20 14:21:05 +02:00
Laurent Rineau b96e46f7a6 Merge branch 'releases/CGAL-4.14-branch' 2019-06-20 14:20:41 +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 69a4241d5e Merge pull request #3987 from lrineau/Polyhedron-demo__mesh_several_surfaces_at_a_time-GF
Polyhedron demo:  mesh several surfaces at a time
2019-06-20 14:20:08 +02:00
Laurent Rineau b0c182ce63 Merge pull request #3987 from lrineau/Polyhedron-demo__mesh_several_surfaces_at_a_time-GF
Polyhedron demo:  mesh several surfaces at a time
2019-06-20 14:09:17 +02:00
Laurent Rineau c64c40491b Merge pull request #4003 from maxGimeno/Demo-Fix_clip_plus_point_selection-GF
3D Demo: Fix Points Selection when Clipping
2019-06-20 14:09:15 +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 f697343e53 Fake merge commit 'refs/pull/3938/head' into releases/CGAL-4.14-branch
I have used `git merge -s ours ...`.
2019-06-20 14:08:02 +02:00