19e1dd8c3f
Merge pull request #3937 from sloriot/Slicer-fix_default_vpm
...
Fix default vertex point map
2019-06-17 13:51:38 +02:00
1af9a8030e
Merge pull request #3964 from sloriot/PMP-coref_invalid_index
...
Fix invalid index
2019-06-17 13:51:36 +02:00
9f99ee087e
Merge pull request #3986 from janetournois/Mesh_3-fix_optimizers_protection-jtournois
...
Mesh_3 : fix global optimizers protection
2019-06-17 13:51:33 +02:00
377d707dfe
Merge pull request #3996 from sloriot/BGL-split_fix_fct_pos
...
Put declaration before the call to the function
2019-06-17 13:51:31 +02:00
04bf5e7248
Merge pull request #3998 from sloriot/BO2-fix_outer_ccb_supply
...
Fix outer ccb supply chain
2019-06-17 13:51:28 +02:00
91157b2167
Fix <CGAL/internal/Mesh_3/check_weights.h>
...
`Has_feature<Mesh_domain>` is not `Tag_true` or `Tag_false`, but
it *derives* from one of them!
Anyway, it is easier to use the nested value `::value`.
2019-06-13 18:08:38 +02:00
dcb9630633
add test file highlighting the bug fixed by the previous commit
2019-06-13 09:43:10 +02:00
4117fcd727
allocate new outer ccb if the initial set is empty
2019-06-13 09:31:02 +02:00
d6fe7d485a
add declaration before usage
2019-06-13 07:44:58 +02:00
a70bf9458a
fix optimizers protection
...
If some vertices have a non-zero weights and they do not belong to input
features, then global optimizers should not be used.
The case without feature protection was not treated until now.
2019-06-06 17:34:53 +02:00
31dd4f11fb
Merge pull request #3969 from lrineau/Polyhedron-demo__fix_segfault_of_load_plugin-GF
...
Polyhedron demo: fix the menu entry 'Load plugin'
2019-06-05 10:44:27 +02:00
926067967a
Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch
2019-06-05 10:43:44 +02:00
da1bfb1596
Merge pull request #3917 from afabri/Surface_mesh-read_off-GF
...
Surface_mesh: Fix read_off(istream,Surface_mesh)
2019-06-05 10:41:09 +02:00
3cfc790a68
Merge pull request #3968 from lrineau/Polyhedron-demo__remove_need_for_Boost_libraries-GF
...
Remove the need for Boost libraries at the top level CMakeLists.txt
2019-06-05 10:41:04 +02:00
44cfe8d2eb
Do not use `REQUIRED OPTIONAL_COMPONENTS` with FindBoost
...
The CMake module `FindBoost.cmake` only supports `OPTIONAL_COMPONENTS` since CMake-3.11. Previously they were treated like required components.
2019-06-03 10:44:01 +02:00
ecaa138761
Do not block load_plugin from loading plugins
...
Since the adoption of the "keywords" feature, the 'Load plugin' menu
was not able to load a plugin with other keywords. That defeats the
purpose of that feature.
2019-05-29 11:44:08 +02:00
cdb72b9f34
Avoid a segfault in `load_plugin`
...
Before that patch `accepted_keywords` was a dangling reference to an
object that was destroyed at the end of the constructor of the class
`Polyhedron_demo`.
Now, that `QStringList` is copied, but it is a short list of short
strings.
2019-05-29 11:42:35 +02:00
cd22917e3d
Remove the need for Boost libraries at the top level CMakeLists.txt
...
The 3D demo does not directly requires Boost libraries. Then are
pulled as a `PUBLIC` dependency of `CGAL::CGAL`. Only two plugins
really need Boost libraries:
- Classification needs Boost iostreams and serialization,
- Mesh_3 `io_image_plugin` needs Boost filesystem for multi-files 3D
images.
2019-05-29 11:18:13 +02:00
d6ea5870e5
fix copy/paste issue
2019-05-29 11:03:55 +09:00
e3a4db56f6
Merge pull request #3948 from MaelRL/PMP-fix_missing_using_414-GF
...
Add missing 'using' for boost's choose_param() / get_param()
2019-05-23 08:45:15 +02:00
7be5e3fbe5
Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch
2019-05-23 08:44:39 +02:00
f51b7e7934
Merge pull request #3876 from sloriot/Nef_3-fix_triangle_order
...
Fix index order of triangles
2019-05-23 08:31:50 +02:00
e5b653953f
Merge pull request #3941 from lrineau/Convex_hull_3-fix_Convex_hull_traits_3_default_of_third_arg-GF
...
Fix the default of 3rd template parameter of Convex_hull_traits_3
2019-05-23 08:31:47 +02:00
c1a13a0a1e
Merge pull request #3949 from lrineau/Installation-fix_ctest_for_Andreas-GF
...
Fix CTest CGAL tests when binary dir is a sub-directory
2019-05-23 08:31:44 +02:00
e4c82fa260
Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch
2019-05-21 16:35:24 +02:00
92a311c04a
Merge pull request #3921 from lrineau/Mesh_3_fix_Boost_1.71-GF
...
Adapt Mesh_criteria_3 to Boost 1.71 (current 'master')
2019-05-21 16:33:28 +02:00
784ce22e64
Merge pull request #3922 from lrineau/Installation-CGAL_is_an_imported_target-GF
...
Header-only: consider CGAL as an imported target (if CMake>=3.11)
2019-05-21 16:33:25 +02:00
946e0bebae
Merge pull request #3930 from sloriot/SDG_T2-fix_insertion_of_range_of_cst
...
T2: Fix insertion of range of constraints
2019-05-21 16:33:22 +02:00
1b92bcd74e
Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch
...
# Conflicts:
# .travis.yml
# .travis/template.txt
2019-05-20 12:27:11 +02:00
357fe1e486
Fix CTest CGAL tests when binary dir is a sub-directory
...
When the current binary dir is a sub-directory of the current sources
dir, then the recursive copy of the sources dir to `__exec_test_dir/`
cannot be done. In that case, do not setup the fixture
directory. Tests can still be run in the source directory (and pollute
it).
2019-05-20 12:18:18 +02:00
85ba338518
Add missing 'using' for boost's choose_param() / get_param()
2019-05-20 11:04:15 +02:00
03202d874f
Fix the default of 3rd template parameter of Convex_hull_traits_3
...
The documentation of `convex_hull_3` says that, if the kernel is "like
`Epick`", then the default traits class of `convex_hull_3` is
`Convex_hull_traits_3`.
But that is wrong, because `Convex_hull_traits_3` is documented with
only two template parameters, and if the kernel is "like `Epick`", the
third argument is `CGAL::Tag_true`, whereas the default of that
parameter is `CGAL::Tag_false`. If users want to write explicitly the
traits in the call to `convex_hull_3`, they cannot know that there is
a third parameters, and that it must be `Tag_true`.
This commit fixes the default of that third argument.
2019-05-17 16:44:14 +02:00
dd84321f56
be more backward compatible + add typedef for AABB-tree definition
2019-05-17 15:01:46 +02:00
6edd9b7c10
Merge pull request #3936 from lrineau/Travis-better_check_of_push_vs_pull_requests-GF
...
Use $TRAVIS_PULL_REQUEST_BRANCH instead
2019-05-16 15:49:15 +02:00
f65cc41e82
add missing default template parameter
2019-05-15 13:00:45 +02:00
f855546ad1
add missing template parameter
2019-05-15 13:00:01 +02:00
7fe156dae7
Use $TRAVIS_PULL_REQUEST_BRANCH instead
...
`TRAVIS_PULL_REQUEST` is actually never empty:
> `TRAVIS_PULL_REQUEST`: The pull request number if the current job is a pull request, “false” if it’s not a pull request.
(from the [documentation](https://docs.travis-ci.com/user/environment-variables/#default-environment-variables ))
Use `TRAVIS_PULL_REQUEST_BRANCH` instead:
> `TRAVIS_PULL_REQUEST_BRANCH`:
> - if the current job is a pull request, the name of the branch from which the PR originated.
> - if the current job is a push build, this variable is empty ("").
2019-05-15 11:46:52 +02:00
471a44ce10
Merge pull request #3935 from sgiraudot/Classification-Fix_include_random_shuffle-GF
...
[Classification] Add missing "algorithm" include
2019-05-15 10:12:31 +02:00
580e71ec7f
Add missing include
2019-05-15 10:03:32 +02:00
9ce9f8e3d9
Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch
2019-05-14 17:51:57 +02:00
90782d4b7f
Revert the merge of two pull-requests that target CGAL-4.14-branch
...
- Revert "Merge pull request #3857 from MaelRL/CGAL-Fix_duplicate_non_manifold_vertices-GF"
- Revert "Merge pull request #3898 from lrineau/Mesh_3-stop_during_protection-lrineau"
2019-05-14 17:50:45 +02:00
26be3a8786
Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch
2019-05-14 16:28:20 +02:00
8dabd25b75
Merge pull request #3857 from MaelRL/CGAL-Fix_duplicate_non_manifold_vertices-GF
...
PMP: Fix duplicate_non_manifold_vertices() with pinched vertices
2019-05-14 16:26:22 +02:00
b7bb3f74ac
Merge pull request #3858 from MaelRL/BGL-Fix_is_valid_polygon_mesh-GF
...
BGL: Fix is_valid_polygon_mesh not breaking away from potential infinite loops
2019-05-14 16:26:19 +02:00
d04a5a24c1
Merge pull request #3898 from lrineau/Mesh_3-stop_during_protection-lrineau
...
Mesh_3 `Protect_edges_sizing_field`: handle the `stop` Boolean
2019-05-14 16:26:16 +02:00
b839d1defa
Merge pull request #3910 from maxGimeno/Polgon_mesh_slicer-Fix_orientation-GF
...
PMP::Orient polylines of Polgon Mesh Slicer ccw.
# Conflicts:
# Polygon_mesh_processing/include/CGAL/Polygon_mesh_slicer.h
2019-05-14 16:25:59 +02:00
5457a6a30b
Merge pull request #3857 from MaelRL/CGAL-Fix_duplicate_non_manifold_vertices-GF
...
PMP: Fix duplicate_non_manifold_vertices() with pinched vertices
2019-05-14 16:18:40 +02:00
8e872081fc
Merge pull request #3898 from lrineau/Mesh_3-stop_during_protection-lrineau
...
Mesh_3 `Protect_edges_sizing_field`: handle the `stop` Boolean
# Conflicts:
# .travis/build_package.sh
# Installation/cmake/modules/CGALConfig_binary.cmake.in
# Installation/cmake/modules/CGALConfig_install.cmake.in
# Installation/cmake/modules/CGAL_SetupCGAL_CoreDependencies.cmake
# Installation/lib/cmake/CGAL/CGALConfig.cmake
# Polygon_mesh_processing/include/CGAL/Polygon_mesh_slicer.h
# Polyhedron/demo/Polyhedron/Plugins/Classification/CMakeLists.txt
# Polyhedron/demo/Polyhedron/Plugins/Mesh_3/CMakeLists.txt
2019-05-14 16:18:24 +02:00
d5b2621076
Merge pull request #3858 from MaelRL/BGL-Fix_is_valid_polygon_mesh-GF
...
BGL: Fix is_valid_polygon_mesh not breaking away from potential infinite loops
2019-05-14 16:15:29 +02:00
696558cb83
Merge pull request #3910 from maxGimeno/Polgon_mesh_slicer-Fix_orientation-GF
...
PMP::Orient polylines of Polgon Mesh Slicer ccw.
2019-05-14 16:15:26 +02:00
Laurent Rineau
Sébastien Loriot
Jane Tournois
Mael Rouxel-Labbé
Simon Giraudot