Commit Graph

1687 Commits

Author SHA1 Message Date
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 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
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
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 da39109d88 fix CI and be more strict also on the operator() call 2023-02-27 09:58:26 +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 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 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 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
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
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