Commit Graph

215 Commits

Author SHA1 Message Date
Sébastien Loriot e80f869147 Merge remote-tracking branch 'cgal/master' 2019-12-20 09:35:45 +01:00
Sébastien Loriot b9a079b530 remove cpp11/cpp0x 2019-11-04 11:34:53 +01:00
Mael Rouxel-Labbé ff09c5d0c8 Merge branch 'SMS-Add_GH_simplification-GF-old' into SMS-Add_GH_simplification-GF 2019-10-25 16:35:53 +02:00
Sébastien Loriot 52164b1fba First pass on removing license notice in header for LGPL files 2019-10-19 15:40:30 +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
Mael Rouxel-Labbé 0f7de56d76 Move a number of Named Parameter type extractor from CGAL::PMP:: to PMP::
These are used in a number of pacakges other than PMP and the code
is also already in /BGL. None are documented.
2019-10-17 12:41:30 +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 41ef56f8ad Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch' into HEAD 2019-07-18 16:57:27 +02:00
Sébastien Loriot b060e6790e Merge remote-tracking branch 'cgal/releases/CGAL-4.13-branch' into HEAD 2019-07-18 16:54:24 +02:00
Sébastien Loriot 560c77f567 rename named function parameter class 2019-07-15 06:25:02 +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
Maxime Gimeno 8d9abf367a Accept negative indicies in faces. 2019-07-09 14:06:27 +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 e2d19b0c8d Replace NULL and Nullptr_t with nullptr and nullptr_t 2019-06-04 23:45:44 +02:00
Andreas Fabri 4e1f2cf017 Replace BOOST_FOREACH with C++11 for 2019-06-04 17:13:53 +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 1a1f336f2c Open with std::ios::binary; isspace needs an unsigned char 2019-05-07 11:41:16 +02:00
Laurent Rineau 008a75d439 Merge pull request #3636 from sgiraudot/Surface_mesh-PLY_IO-GF
[Small Feature] Surface Mesh PLY IO
2019-05-06 15:46:07 +02:00
Maxime Gimeno 14ec0d325b Fix OBJ reading. 2019-04-24 15:38:28 +02:00
Simon Giraudot 207a432dfd Merge remote-tracking branch 'mine/Surface_mesh-PLY_IO-GF' into Surface_mesh-PLY_IO-GF 2019-04-23 12:08:44 +02:00
Sebastien Loriot b87db08b08
Merge pull request #3355 from maxGimeno/Demo-Multiple_viewers-GF
Polyhedron demo: Multiple Viewers
2019-04-23 10:34:26 +02:00
Maxime Gimeno 8feb0cbfef Comment cerr in OBJ_reader 2019-04-23 10:29:51 +02:00
Andreas Fabri 864ba4249d Merge branch 'Surface_mesh-PLY_IO-GF-old' into Surface_mesh-PLY_IO-GF 2019-04-12 16:19:53 +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 efc2084360 Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch' 2019-04-12 15:42:14 +02:00
Sebastien Loriot 08251247c2
Merge pull request #3831 from afabri/PSP-cleanup-GF
Point Set Processing:  cleanup
2019-04-12 15:34:45 +02:00
Sebastien Loriot fd273fe850
Merge pull request #3779 from afabri/Polyhedron-read_off-GF
Polyhedron:  read_OFF() must not set the badbit if there are 0 vertices
2019-04-12 15:27:24 +02:00
Simon Giraudot 717137e48f Merge remote-tracking branch 'mine/Surface_mesh-PLY_IO-GF' into Surface_mesh-PLY_IO-GF 2019-04-09 15:11:58 +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
Maxime Gimeno de47fb3348 Fix conflicts 2019-04-09 10:31:10 +02:00
Andreas Fabri 44f52f436a Add include of sstream 2019-04-08 16:16:51 +02:00
Sébastien Loriot 93f9a83ad3 STL writer is now under LGPL 2019-04-04 14:24:07 +02:00
Simon Giraudot 2c1ca1e893 Replace old color API using global const variable with new one using functions 2019-04-03 11:51:29 +02:00
Sébastien Loriot 124012d9f9 replace cpp11::array by std::array 2019-03-29 13:28:33 +01:00
Sébastien Loriot f62624c4f9 replace cpp11::tuple by std::tuple 2019-03-29 13:28:33 +01: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
Andreas Fabri 5d58bde7f2 Polyhedron: Fix Issue #3108 2019-03-19 17:39:04 +01:00
Maxime Gimeno 94541df835 Update to master 2019-03-07 14:33:10 +01:00
Laurent Rineau 2671d056cf Merge pull request #3685 from afabri/CGAL-cleanup-GF
CGAL:  Clean up examples and tests
2019-02-28 20:48:48 +01:00
Simon Giraudot 1f54c5e0af Merge remote-tracking branch 'mine/Surface_mesh-PLY_IO-GF' into Surface_mesh-PLY_IO-GF 2019-02-26 14:03:27 +01:00
Simon Giraudot 9256c04157 Replace old color API using global const variable with new one using functions 2019-02-26 13:48:59 +01:00
Andreas Fabri 7fa9781894 Remove derivation as workaround for a typedef 2019-02-14 12:12:01 +01:00
Andreas Fabri e989b87dfe Distance, Generator, HDS, Convex_hull, Polyhedron, PCA 2019-02-14 10:39:56 +01:00
Maxime Gimeno c650f26c23 Fix OFF reader to detect sooner the flux errors. 2019-02-11 12:45:27 +01:00
Simon Giraudot eaa29b9116 Merge branch 'Stream_support-Enhance_color-GF' into Surface_mesh-PLY_IO-GF 2019-01-25 11:41:53 +01:00