songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
89,520 Commits 3 Branches 156 Tags 959 MiB
Commit Graph

275 Commits

Author SHA1 Message Date
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
Mael 8f29c7cb63
Merge branch 'master' into CGAL-Parallel_if_available_tag 2020-01-29 16:42:54 +01:00
Laurent Rineau 315a0b54d1 Merge pull request #4468 from maxGimeno/TBB-Fix_deprecation_warnings-5_0-maxGimeno 
TBB deprecated code replacement
 2020-01-29 16:27:53 +01:00
Maxime Gimeno 213852c474 Forgot Classification 2020-01-22 10:33:51 +01:00
Maxime Gimeno 85712ba28c WIP replacing tbb deprecated includes. 2020-01-14 15:03:20 +01:00
Laurent Rineau 65cde3ce79
Merge branch 'master' into Faster_dd_spatial_searching-cjamin 2019-12-03 19:18:15 +01:00
Mael Rouxel-Labbé e73b973b62 Use Parallel_if_available_tag to simplify code that used CGAL_LINKED_WITH_TBB 2019-11-20 12:24:54 +01:00
Sébastien Loriot b9a079b530 remove cpp11/cpp0x 2019-11-04 11:34:53 +01:00
Simon Giraudot c43c6ac2fa Merge remote-tracking branch 'clement/Faster_dd_spatial_searching-cjamin' into Faster_dd_spatial_searching-cjamin 2019-10-22 13:21:53 +02:00
Sébastien Loriot 0228f1e4ee update SPDX tag to use the original customer license 
The license notice in the headers are not in the original headers
 2019-10-20 10:43:11 +02:00
Sébastien Loriot e74473ed28 remove license notice from Random Forest classif 2019-10-20 01:04:43 +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
Maxime GIMENO 4e4dd7986a
Remove sneaky backquote 2019-09-30 09:10:45 +02:00
Laurent Rineau 1bce3f7909 Merge branch 'releases/CGAL-4.14-branch' 2019-09-27 16:25:29 +02:00
Laurent Rineau 0b66eb0d23 Merge remote-tracking branch 'cgal/releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch 
# Conflicts:
#	.travis/install.sh
 2019-09-27 16:24:41 +02:00
Maxime Gimeno bdab125c8a Test EPOCH. 2019-09-27 10:38:22 +02:00
Maxime Gimeno 583b0ae3c3 conditional include 2019-09-26 16:41:18 +02:00
Simon Giraudot 56df078838 Fix OpenCV includes (tested with OpenCV 2.4, 3.2 and 4.1) 2019-09-23 10:53:21 +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
Sébastien Loriot cebf0657d8 Use a full CGAL version of named function parameters 
no longer rely on boost
 2019-07-14 22:45:47 +02:00
Sébastien Loriot 983645a51a match @{ and @} 2019-07-05 21:49:46 +02:00
Simon Giraudot 91dc961b18 Use cache optimisation for KD Tree on indices for classification + shape detection 2019-07-04 13:18:52 +02:00
Laurent Rineau c0ba28f80a Merge branch 'releases/CGAL-4.14-branch' 2019-07-03 11:18:20 +02:00
Laurent Rineau e79bfd5d03 Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch 2019-07-03 11:10:03 +02:00
Simon Giraudot 2a96d5b42d Remove lambda/auto from cxx03 code 2019-07-01 14:54:31 +02:00
Laurent Rineau eea3cfe18f Merge pull request #3956 from sgiraudot/Classification-Fix_deprecated_random_shuffle-GF 
Classification: use cpp98::random_shuffle to avoid errors in C++17
 2019-06-17 14:16:05 +02:00
Laurent Rineau a7c4793b5b Merge pull request #3961 from sgiraudot/Classification-Fix_clusters-GF 
[Classification] Make cluster lightweight to copy + fix bbox computation
 2019-06-17 14:15:57 +02:00
Laurent Rineau 5294e53f42 Merge pull request #3956 from sgiraudot/Classification-Fix_deprecated_random_shuffle-GF 
Classification: use cpp98::random_shuffle to avoid errors in C++17
 2019-06-17 14:15:23 +02:00
Laurent Rineau 8089f7c33c Merge pull request #3961 from sgiraudot/Classification-Fix_clusters-GF 
[Classification] Make cluster lightweight to copy + fix bbox computation
 2019-06-17 14:15:20 +02:00
Andreas Fabri 4581f1b7a8 Morte replacements 2019-06-05 08:39:55 +02:00
Simon Giraudot 16a2644e31 Make cluster lightweight to copy + fix bbox computation 2019-05-27 15:41:03 +02:00
Simon Giraudot 48dda04768 Use cpp98::random_shuffle to avoid errors in C++17 2019-05-24 15:13:15 +02:00
Laurent Rineau b8fe6b10ee Merge pull request #3804 from afabri/CGAL_tests_must_not_include_basic-GF 
Do not include <CGAL/basic.h>
 2019-05-21 16:37:01 +02:00
Laurent Rineau 934544dbde Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch' 2019-05-15 10:13:14 +02:00
Simon Giraudot 580e71ec7f Add missing include 2019-05-15 10:03:32 +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
Laurent Rineau 2f8eeb0db3 Fix the headers dependency-hell around gmpxx in Number_types 2019-05-09 15:05:23 +02:00
Sébastien Loriot c8a3fdaff6 Merge pull request #3625 from sgiraudot/Stream_support-Enhance_color-GF 
[Small Feature] Reworked CGAL::Color
 2019-04-12 15:54:30 +02:00
Sébastien Loriot db65bd8ecc Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch' 2019-04-11 21:38:48 +02:00
albert-github 1dd7473818 Correction of links 
Correction of redirected links and links that moved to another place.
 2019-04-11 21:37:05 +02:00
Simon Giraudot d314711eaf Merge remote-tracking branch 'mine/Stream_support-Enhance_color-GF' into Stream_support-Enhance_color-GF 2019-04-09 15:00:56 +02:00
Andreas Fabri 9e3685563e Add #include 2019-04-03 11:51:30 +02:00
Simon Giraudot bd2a66ffcd Remove deprecated parts of Classification 2019-04-03 11:51:29 +02:00
Simon Giraudot 7518d5642a Remove CGAL::Classification::RGB_Color and HSV_Color and just use CGAL::Color everywhere 2019-04-03 11:51:29 +02:00
Sébastien Loriot 1c119aec44 replace cpp11::unordered_FOO by std::unordered_FOO 2019-03-29 13:28:33 +01:00