Sébastien Loriot
47027d6f5b
extra run of the script to remove tabs and trailing whitespaces
2020-03-26 18:59:19 +01:00
Sébastien Loriot
4421fff65f
Update branch from master after trailing whitespaces and tabs removal
2020-03-26 18:58:50 +01:00
Sébastien Loriot
8bb22d5b2c
extra run of the script to remove tabs and trailing whitespaces
...
right after the merge of the 5.0 release branch
+ manual fix of the files (indentation was changed in the meantime):
* Spatial_sorting/include/CGAL/Multiscale_sort.h
* Spatial_sorting/test/Spatial_sorting/test_multiscale.cpp
2020-03-26 14:26:59 +01:00
Sébastien Loriot
8b153fb495
Merge branch 'cgal/releases/CGAL-5.0-branch'
...
whitespace+tab removal, merged with option -Xignore-space-change
2020-03-26 14:22:32 +01: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
0a46621dc6
Merge branch 'cgal/releases/CGAL-4.14-branch'
...
whitespace+tab removal, merged with option -Xignore-all-space
2020-03-26 13:28:46 +01:00
Sébastien Loriot
590612a563
run the script to remove tabs and trailing whitespaces
2020-03-26 13:25:16 +01:00
Simon Giraudot
358b2d20d8
Fix point map type
2020-03-26 11:10:23 +01:00
Simon Giraudot
1c3176468e
Use real tags to select implementation
2020-03-26 11:08:12 +01:00
Mael
855003baa1
Merge branch 'master' into BGL-Alpha_expansion_graphcut-GF
2020-03-24 08:18:23 +01:00
Laurent Rineau
be7dedc49b
Merge branch 'releases/CGAL-5.0-branch'
2020-02-25 14:47:23 +01:00
Laurent Rineau
c43d6bd8eb
Merge branch 'releases/CGAL-4.14-branch' into releases/CGAL-5.0-branch
2020-02-25 14:47:03 +01:00
Laurent Rineau
1f52e0085a
Fix citation (wrong case)
2020-02-19 11:22:38 +01:00
Laurent Rineau
2c5826dd6f
Merge pull request #4474 from sloriot/CGAL-warning_macro
...
Update warning macro usages
# Conflicts:
# Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Hole_filling/Triangulate_hole_polyline.h
2020-01-17 16:29:49 +01:00
Laurent Rineau
fe91249ac4
Merge pull request #4474 from sloriot/CGAL-warning_macro
...
Update warning macro usages
# Conflicts:
# Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Hole_filling/Triangulate_hole_polyline.h
2020-01-17 16:27:13 +01:00
Sébastien Loriot
4fbd1ed69c
use CGAL_warning_msg instead of CGAL_warning to display a message
2020-01-16 14:14:13 +01:00
Simon Giraudot
020c63bcf9
Fix licenses
2020-01-16 10:57:18 +01:00
Simon Giraudot
764fa731ee
Merge remote-tracking branch 'mine/BGL-Alpha_expansion_graphcut-GF' into BGL-Alpha_expansion_graphcut-GF
2020-01-15 13:45:30 +01:00
Laurent Rineau
0fa0c4fbb9
Merge pull request #4244 from maxGimeno/AABB_tree-Make_accelerate_distance_queries_default-maxGimeno
...
AABB_tree: make accelerate distance queries default
2019-12-05 11:05:35 +01:00
Laurent Rineau
15d9e1f0ff
Restore the alphabetical order of `dependencies` files
2019-10-31 14:41:37 +01:00
Sébastien Loriot
2c17ec76fd
relicense to GPL-3+ (allowed since it is GPL-2+ originally)
2019-10-20 00:41:40 +02:00
Sébastien Loriot
c4c1a0b317
Remove license notice in headers manually
2019-10-19 16:00:05 +02: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
Laurent Rineau
dd734e3098
Merge pull request #4283 from sloriot/SMSeg-more_robust
...
Be more robust to degenerate and almost degenerate faces
2019-10-15 16:31:33 +02:00
Sébastien Loriot
15a546084c
be more robust to degenerate and almost degenerate faces
2019-10-10 17:22:19 +02:00
Maxime Gimeno
dd566a2c96
Fixes
2019-09-24 13:49:10 +02:00
Maxime Gimeno
a52592909f
Remove all calls to accelerate_distance_queries(), now redundant.
2019-09-24 11:44:20 +02:00
Sébastien Loriot
25a05e9f4c
Merge branch 'CGAL-named_function_parameters-4.14' into master
...
Conflicts resolved by hand
2019-07-28 23:46:43 +02:00
Sébastien Loriot
2f81a21523
Merge 'CGAL-named_function_parameters' for 4.13-branch into 4.14-branch
...
Conflicts resolved by hand
2019-07-28 22:30:13 +02:00
Simon Giraudot
475e9fdec6
Update with reviews
2019-07-25 09:16:16 +02:00
Simon Giraudot
b062907334
Propagate API change to classification and segmentation
2019-07-23 09:21:31 +02:00
Simon Giraudot
c06c778ca9
Move MaxFlow back to segmentation and fix documentation
2019-07-23 09:21:20 +02:00
Simon Giraudot
497c121e55
Finalize API of alpha expansion + doc
2019-07-23 08:43:17 +02:00
Simon Giraudot
f0df168096
Merge all three versions with one unique function + separate calls
2019-07-23 08:43:17 +02:00
Simon Giraudot
4cd9282f79
Start working on public API for alpha expansion
2019-07-23 08:43:01 +02:00
Simon Giraudot
5ca8fcf47b
Make Boost Alpha Expansion use BGL API
2019-07-23 08:40:25 +02:00
Sébastien Loriot
560c77f567
rename named function parameter class
2019-07-15 06:25:02 +02:00
Laurent Rineau
4fbf00fb8a
CMake>=3.13: opt for for new policies up to 3.15
2019-06-19 14:34:59 +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
Andreas Fabri
677e2d70b5
fix Segmentation OpenMesh example
2019-06-05 09:07:04 +02:00
Andreas Fabri
e2d19b0c8d
Replace NULL and Nullptr_t with nullptr and nullptr_t
2019-06-04 23:45:44 +02:00
Andreas Fabri
cb58f1bda8
Use C++11 for loop in examples
2019-06-03 18:07:34 +02:00
Mael Rouxel-Labbé
2848158354
Fix typos
2019-05-20 08:54:04 +02:00
Laurent Rineau
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
Andreas Fabri
32a60390fd
Fix dependencies
2019-04-09 11:49:50 +02:00
Andreas Fabri
a2075494da
Move trace.h
2019-04-08 16:16:49 +02:00
Sébastien Loriot
d60f5645aa
replace BOOST_FOREACH by c++ ranged-based for loop
...
some of the command used for the replacement:
ack --cpp BOOST_FOREACH -l | xargs sed -i -E "s/BOOST_FOREACH\(([a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack --cpp BOOST_FOREACH -l | xargs sed -i -E "s/BOOST_FOREACH\((const [a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack --cpp BOOST_FOREACH -l | xargs sed -i -E "s/BOOST_FOREACH\((const typename [a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack --cpp BOOST_FOREACH -l | xargs sed -i -E "s/BOOST_FOREACH\((typename [<>a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack "boost/foreach.hpp" -l --cpp | xargs sed -i '/boost\/foreach.hpp>/d'
2019-03-29 13:22:15 +01:00
Sébastien Loriot
59bc453b42
first batch of replacement for level 1 in classified ref man
...
command used:
grep -l "##" */doc/*/PackageDescription.txt | xargs sed -i -E 's/\#\#\s*([[:print:]]+[[:alnum:]])\s*\#\#\s*$/\\cgalCRPSection{\1}/'
2019-02-14 10:32:39 +01:00