Commit Graph

318 Commits

Author SHA1 Message Date
Andreas Fabri 444f347f76 Fixes inside a commented example 2021-09-23 17:00:10 +02:00
Sébastien Loriot 5945e48a3e restore sub-directories accidently removed in 98e471849b 2021-09-17 08:14:06 +02:00
Sébastien Loriot 98e471849b moving files from internal to PKG/internal 2021-08-26 11:33:39 +02:00
Laurent Rineau 343ef10367 Merge pull request #5547 from sgiraudot/Fix_stdpow_related_warnings-GF
Fix warning: std::pow(float, int) returns double instead of float in recent C++
2021-04-06 15:13:00 +02:00
Simon Giraudot 8094b08708 Add missing includes 2021-03-25 10:37:09 +01:00
Simon Giraudot ab14acff77 Replace std::pow(x,2) by CGAL::square(x) 2021-03-23 13:14:41 +01:00
Mael Rouxel-Labbé f55ef7dd50 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-10-09 18:36:17 +02:00
Sébastien Loriot e893ac1178 cosmetic changes 2020-08-18 10:06:51 +02:00
Mael Rouxel-Labbé 0d66e19361 IO documentation fixes
See @sloriot's review:

https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Polgyon_soup_mesh_IO/2nd_round/Answer_to_review

(+ some commits before and after this one)
2020-07-24 17:06:00 +02:00
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
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
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
Andreas Fabri e2d19b0c8d Replace NULL and Nullptr_t with nullptr and nullptr_t 2019-06-04 23:45:44 +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 a2075494da Move trace.h 2019-04-08 16:16:49 +02:00
Sébastien Loriot 0685423ae8 update from cgal/master 2018-11-02 11:32:31 +01:00