Sébastien Loriot
c1294a0eaa
boost::integral_constant ---> std::integral_constant
2023-04-29 09:42:15 +02:00
Jane Tournois
b76f640a41
Merge branch 'Mesh_3-edge_min_size-GF' into Mesh_3-min_size-jtournois
...
# Conflicts:
# Mesh_3/test/Mesh_3/CMakeLists.txt
# Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Meshing_dialog.ui
2023-04-24 13:59:48 +02:00
Jane Tournois
e30ccd2cc5
Merge branch 'Mesh_3-add_minimal_size_criterion_new-jtournois' into Mesh_3-min_size-jtournois
2023-04-24 12:56:40 +01:00
Sébastien Loriot
cf45dd3d5b
boost::is_base_of -> std::is_base_of
2023-04-23 22:37:07 +02:00
Sébastien Loriot
b039040f73
boost::is_convertible -> std::is_convertible
2023-04-23 22:37:07 +02:00
Sébastien Loriot
a1b2dd014d
boost::is_pointer -> std::is_pointer
2023-04-23 22:37:07 +02:00
Sébastien Loriot
d4d2225801
boost::is_reference -> std::is_reference
2023-04-23 22:37:07 +02:00
Sébastien Loriot
6fd9476cd7
boost::is_integral -> std::is_integral
2023-04-23 22:37:07 +02:00
Sébastien Loriot
390cccf63b
boost::is_empty -> std::is_empty
2023-04-23 22:37:07 +02:00
Sébastien Loriot
e82d970d19
boost::next -> std::next
2023-04-23 22:37:07 +02:00
Sébastien Loriot
99619dc634
boost::prior -> std::prev
2023-04-23 22:37:07 +02:00
Sébastien Loriot
a88af6c0c6
boost::array -> std::array
2023-04-23 22:37:07 +02:00
Sébastien Loriot
b99c384528
boost::remove_pointer -> std::remove_pointer
2023-04-23 22:37:06 +02:00
Sébastien Loriot
8b3acae1c7
boost::remove_reference -> std::remove_reference
2023-04-23 22:36:59 +02:00
Sébastien Loriot
fa301554ce
boost::remove_v -> std::remove_cv_t
2023-04-23 19:13:56 +02:00
Sébastien Loriot
61834d5a26
boost::remove_const -> std::remove_const_t
2023-04-23 19:07:54 +02:00
Jane Tournois
8c8f8294a8
fix reference type
2023-04-21 12:10:23 +02:00
Jane Tournois
cb9a4c6c96
add missing reference_wrapper
2023-04-21 12:10:15 +02:00
Mael Rouxel-Labbé
1a5826f11a
Merge remote-tracking branch 'cgal/master' into SLS-Weighted_skeleton-GF
2023-04-17 12:48:30 +02:00
Laurent Rineau
594682dde3
Merge pull request #5461 from sloriot/PMP-decimation
...
Add coplanar decimation
2023-04-17 10:14:07 +02:00
Laurent Rineau
824976a003
Merge pull request #7236 from albert-github/feature/issue_7231
...
issue #7231 Improvement of layout of refines relations.
2023-04-17 10:14:01 +02:00
albert-github
8a0b21461d
Unexpected backtick
...
- Corrected some more redundant / missing backticks
- correctes a spelling error (Boolean_set_operations_2/doc/Boolean_set_operations_2/CGAL/Boolean_set_operations_2/Gps_default_dcel.h)
2023-04-11 17:38:37 +02:00
Jane Tournois
7eb9a5a0cc
Merge remote-tracking branch 'cgal/master' into Mesh_3-triple_line_extraction_and_weights-GF
...
# Conflicts:
# Mesh_3/include/CGAL/Labeled_mesh_domain_3.h
2023-04-07 15:11:30 +02:00
Laurent Rineau
1dce90ee79
Merge remote-tracking branch 'cgal/master' into CGAL-allow_Epick_with_float-GF
2023-04-07 10:59:51 +02:00
Jane Tournois
3e3f66f75d
Merge remote-tracking branch 'cgal/master' into Mesh_3-add_minimal_size_criterion_new-jtournois
...
# Conflicts:
# Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Mesh_3_plugin.cpp
2023-04-06 12:04:47 +02:00
Sébastien Loriot
cb672d4d90
Merge remote-tracking branch 'cgal/master' into PMP-decimation
2023-04-04 14:25:17 +02:00
Sébastien Loriot
cfa8c2954f
document the property map version of parameters
2023-03-31 14:39:33 +02:00
Laurent Rineau
3620c3b067
Merge pull request #7329 from afabri/Subdivision-Linear-GF
...
Subdivision: Add example for Linear_mask_3
2023-03-31 11:10:49 +02:00
Laurent Rineau
d3a91046a9
Merge pull request #7276 from afabri/PMP_smooth_scale-GF
...
PMP: Add np for not scaling smoothed mesh
2023-03-30 18:04:34 +02:00
Jane Tournois
b52913b6cc
Merge remote-tracking branch 'cgal/master' into Mesh_3-edge_min_size-GF
...
# Conflicts:
# Mesh_3/doc/Mesh_3/Doxyfile.in
2023-03-20 14:07:19 +01:00
Mael Rouxel-Labbé
85911f1b64
Merge remote-tracking branch 'cgal/master' into SLS-Weighted_skeleton-GF
2023-03-20 10:06:38 +01:00
Mael Rouxel-Labbé
298440062f
Update weighted skeleton construction, offsetting, and extrusion to new API
2023-03-18 21:33:40 +01:00
Andreas Fabri
dbd56de018
merge master
2023-03-17 16:58:36 +01:00
Andreas Fabri
0f6b544e2e
Remove a backtick in Compact_container doc
2023-03-17 16:51:09 +01:00
albert-github
2d60f46985
issue #7231 Improvement of layout of refines relations.
...
- Adjusted cgalRefines according to reviews
- Implemented it in all files
2023-03-14 17:37:50 +01:00
Laurent Rineau
35a1285a12
Merge pull request #6129 from janetournois/Mesh_3-triple_line_extraction-GF
...
Mesh_3 - add detection of intersection lines from labeled images
# Conflicts:
# Installation/CHANGES.md
2023-03-13 16:46:07 +01:00
Sébastien Loriot
36b448912e
add a first simple post-processing step
2023-03-13 12:00:45 +01:00
Jane Tournois
818b08f331
add edge_min_size
...
to constrain protecting balls placement to insert no feature smaller
than the given bound
2023-03-09 15:57:08 +01:00
Sébastien Loriot
33c868818f
fix property map for region primitives
2023-03-07 17:55:28 +01:00
Sébastien Loriot
648377f127
fix np name + plug region growing in decimation plugin + change cosinus sign in decimate + update doc
2023-03-02 19:08:10 +01:00
Sébastien Loriot
f8cc9e6bd0
rename np
2023-03-02 14:49:17 +01:00
Sébastien Loriot
b1d2744821
Merge branch 'master' into PMP-decimation
2023-03-02 14:24:27 +01:00
Sébastien Loriot
6043192a90
fix CI and be more strict also on the operator() call
2023-02-28 16:46:30 +01:00
Sébastien Loriot
12465a6c40
named parameter to pass normal of patches
2023-02-27 17:13:23 +01:00
Sébastien Loriot
52ff9c4e66
add an option to not triangulate patches
2023-02-27 15:16:13 +01:00
Sébastien Loriot
da39109d88
fix CI and be more strict also on the operator() call
2023-02-27 09:58:26 +01:00
Mael Rouxel-Labbé
90877e18b5
Add SLS/extrude_skeleton.h
2023-02-24 18:50:53 +01:00
Jane Tournois
17b137bf0c
fix reference type
2023-02-24 17:28:40 +01:00
Jane Tournois
c469c4d2ac
add missing reference_wrapper
2023-02-24 15:12:54 +01:00
Jane Tournois
036ddc57cc
differentiate between cref and ref in compatibility wrapper
2023-02-24 13:53:15 +01:00
Sébastien Loriot
39de8cb718
also allow non-const reference
2023-02-24 13:11:46 +01:00
Jane Tournois
c6d0f90236
differentiate between cref and ref in compatibility wrapper
2023-02-24 11:18:13 +01:00
Jane Tournois
f08a7c95a3
wip modify weights image when feature protection is used
2023-02-23 16:42:54 +01:00
Sébastien Loriot
da2efe69c7
also allow non-const reference
2023-02-23 16:32:47 +01:00
Jane Tournois
d1e79542f2
wip
2023-02-23 16:10:06 +01:00
Jane Tournois
0d550a5938
Merge remote-tracking branch 'cgal/master' into pr/janetournois/7116
...
# Conflicts:
# Mesh_3/test/Mesh_3/CMakeLists.txt
2023-02-23 13:06:59 +01:00
Jane Tournois
e2296b581f
fix the postprocessing weights function
...
add a parameter to generate_label_weights() to postprocess weights
and fix example code
2023-02-23 10:19:40 +01:00
Jane Tournois
e8e3eaa7b4
Merge remote-tracking branch 'cgal/master' into Mesh_3-triple_line_extraction-GF
...
# Conflicts:
# Mesh_3/test/Mesh_3/CMakeLists.txt
2023-02-21 11:05:30 +01:00
Mael Rouxel-Labbé
ee13f77810
Various improvements
2023-02-20 10:08:21 +01:00
Andreas Fabri
545009ab7c
PMP: Add np for not scaling smoothed mesh
2023-02-19 21:25:25 +00:00
Sébastien Loriot
640910288b
Merge remote-tracking branch 'cgal/master' into Region_growing-revision-soesau
2023-02-16 14:18:17 +01:00
Sébastien Loriot
c1165a79aa
rename named parameter
2023-02-16 11:25:23 +01:00
Laurent Rineau
a5052f4cd8
Merge pull request #6835 from MaelRL/CGAL-Clean_CMakeLists.txt-GF
...
Some CMakeLists.txts cleaning
2023-02-16 10:52:29 +01:00
Laurent Rineau
166ff0fdc7
Try to fix compilation with MSVC++
2023-02-14 13:28:07 +01:00
Sébastien Loriot
fbe559adc9
Merge 'cgal/master' into PMP-decimation
2023-02-14 08:33:24 +01:00
Sébastien Loriot
7e38151479
add documentation for remeshing functions + update API
...
code has not been updated yet
2023-02-09 16:31:00 +01:00
Sébastien Loriot
9242a810c4
Merge remote-tracking branch 'cgal/master' into Region_growing-revision-soesau
2023-02-07 11:31:55 +01:00
Laurent Rineau
e8d1095526
Use Output_rep to display debug info
2023-02-06 10:00:58 +01:00
Laurent Rineau
bf6d67951c
Introduce Base_with_time_stamp
2023-02-06 10:00:55 +01:00
Laurent Rineau
d3cbf432ec
Merge pull request #7201 from GilesBathgate/General-remove_boost_lexical_string_cast-GilesBathgate
...
Replace use of boost::lexical_cast<std::string> with std::to_string
2023-02-02 10:58:17 +01:00
Sébastien Loriot
9e137bca24
Merge 'cgal/master'
2023-01-31 12:26:55 +01:00
Giles Bathgate
679ee1f870
Remove use of the safe-bool idiom, replace with explicit operator bool
2023-01-30 19:39:42 +00:00
Mael
153c603209
Merge branch 'master' into CGAL-Clean_CMakeLists.txt-GF
2023-01-27 22:09:02 +01:00
Laurent Rineau
5f8930db8c
Merge branch '5.5.x-branch'
...
# Conflicts:
# Convex_hull_2/test/Convex_hull_2/ch_test_CH.cpp
# Convex_hull_2/test/Convex_hull_2/ch_test_SC.cpp
# Convex_hull_2/test/Convex_hull_2/ch_test_SH.cpp
# Convex_hull_2/test/Convex_hull_2/ch_test_SS.cpp
# Straight_skeleton_2/include/CGAL/constructions/Straight_skeleton_cons_ftC2.h
# Straight_skeleton_2/include/CGAL/predicates/Straight_skeleton_pred_ftC2.h
2023-01-27 21:16:14 +01:00
Jane Tournois
293f851f46
rename NP detect_features to features_detector
2023-01-24 12:18:17 +01:00
Giles Bathgate
22b069720a
Replace use of lexical_cast<std::string> with std::to_string
...
use std::prev in Plane_3_Triangle_3_intersection.h do to lack of
implicit header include.
2023-01-15 17:23:04 +00:00
Jane Tournois
46617ad48f
add input_features named parameter
...
this way the user can
* detect features (on bbox and inside image),
AND
* provide his own features
WARNING : features MUST NOT overlap, or feature protection will endlessly loop
2023-01-13 16:13:52 +01:00
Mael
4d22c90474
Merge branch 'master' into feature/bug_documentation_spell_20221113
2023-01-04 10:06:45 +01:00
Sébastien Loriot
2e0bc5ec99
Revert "Prevent_deref shall not return a reference to the iterator as it can be copied"
...
it seems to have dramatic consequences on the runtime when using Polyhedron in test_pmp_clip
for example.
This reverts commit 7c4123152b .
2022-12-22 17:25:58 +01:00
Sébastien Loriot
f372bbe7c2
make smooth an option that is OFF by default
2022-12-19 14:35:16 +01:00
Andreas Fabri
39ebebdb5b
merge master
2022-12-08 16:49:09 +00:00
Mael
0ff7882997
Merge branch 'master' into feature/bug_documentation_spell_20221113
2022-12-06 22:21:06 +01:00
Mael
6538b22e06
Merge branch 'master' into CGAL-Clean_CMakeLists.txt-GF
2022-12-05 16:03:41 +01:00
Jane Tournois
07fb42117c
add named parameters and doc
2022-12-05 15:56:56 +01:00
Laurent Rineau
e8ec440859
Merge branch 'master' into Kernel-Compare_distance_3_RT_FT__always_Filtered_predicate_RT_FT-GF
...
# Conflicts:
# STL_Extension/doc/STL_Extension/CGAL/Concurrent_compact_container.h
2022-12-05 14:51:31 +01:00
Laurent Rineau
67b5c791e9
Merge pull request #7075 from MaelRL/CGAL-Fix_some_links-GF
...
Update some links + https
2022-12-05 12:22:06 +01:00
Mael
da0b13699c
Merge branch 'master' into Kernel-Compare_distance_3_RT_FT__always_Filtered_predicate_RT_FT-GF
2022-12-02 23:19:29 +01:00
Andreas Fabri
8ddf7848a0
forward call instead of duplicated code
2022-11-30 10:03:45 +00:00
Andreas Fabri
699454ae84
STL Extensions: Correct spelling
2022-11-29 13:22:00 +00:00
Andreas Fabri
7babddf443
PMP: Replace parameter with named parameter
2022-11-29 12:45:47 +00:00
Laurent Rineau
5c943e558c
Merge pull request #6935 from lrineau/CGAL-fix_autotest_with_ctest-GF
...
Fix autotest_cgal_with_ctest
2022-11-25 10:15:07 +01:00
Laurent Rineau
6cff086454
Merge pull request #7067 from sloriot/PMP-clean_up_pmp_bo_params
...
Remove no longer needed function
2022-11-25 10:14:59 +01:00
Laurent Rineau
b363b7e4af
Merge pull request #6935 from lrineau/CGAL-fix_autotest_with_ctest-GF
...
Fix autotest_cgal_with_ctest
2022-11-25 10:14:18 +01:00
Sébastien Loriot
c5207cb5ad
Merge remote-tracking branch 'cgal/master' into HEAD
2022-11-24 09:54:56 +01:00
Mael Rouxel-Labbé
b5c21e1f5d
Http -> https + update some dead links
2022-11-23 18:54:37 +01:00
Sébastien Loriot
fd00ce2d02
seems that the no_parameter function is no longer needed
2022-11-21 16:02:04 +01:00
Sébastien Loriot
7322c7908d
try to workaround warnings
2022-11-21 14:09:08 +01:00
Sébastien Loriot
4d797b55c4
try working around a warning
2022-11-17 19:03:30 +01:00
albert-github
eed54a0ae5
spelling corrections
...
Some spelling corrections (Directories starting with `O`-`S` , first part),
some backward work
some forward work
2022-11-15 18:45:39 +01:00
albert-github
3674c937f7
spelling corrections
...
Some spelling corrections (Directories starting with `M`-` N`),
some backward work
some forward work
2022-11-15 15:21:01 +01:00