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

584 Commits

Author SHA1 Message Date
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
Mael Rouxel-Labbé 30d4754a04 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-03-17 09:03:12 +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
Mael Rouxel-Labbé 41271b67f6 Improvements to CGAL i/o across the board 2020-01-29 10:00:07 +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
Laurent Rineau 6ffd76a87e Merge pull request #2792 from afabri/Intersections_3-Add_missing_do_intersect-GF 
Intersections_3:  Add missing do_intersect() overloads
 2019-01-18 16:37:54 +01:00
Guillaume Damiand 7d406fbb9c
Merge branch 'master' into CGAL-cmake_cleanup-gdamiand 2018-11-05 07:32:58 +01:00
Maxime Gimeno aee51d4b42 Add Dependency to Distance_3 2018-11-02 11:36:43 +01:00
Sébastien Loriot 0685423ae8 update from cgal/master 2018-11-02 11:32:31 +01:00
Guillaume Damiand 92ba7fa6c9 Update minimum cmake required version in all CMakeLists.txt 2018-10-18 14:49:23 +02:00
Guillaume Damiand 0bd9088b5a Remove all include( ) and include( CGAL_CreateSingleSourceCGALProgram ) in CMakeLists.txt; they are no more required. 2018-10-17 14:17:08 +02:00
Guillaume Damiand 7f09308d33 Remove all include_directories(BEFORE ../../include) in CMakeLists.txt 2018-10-17 13:07:22 +02:00
Sébastien Loriot 2f9408f867 rename link name to match package name 2018-10-08 10:28:55 +02:00
Sébastien Loriot 3dd0aa112d rename macro not following the convention 2018-10-08 10:28:55 +02:00
Sébastien Loriot ea240cfac5 use \PkgXXX instead of \PkgXXXSummary 2018-10-08 10:28:44 +02:00
Sébastien Loriot a2e8a1c68f add the suffix Ref to doxygen link to reference 2018-10-08 10:26:56 +02:00
Andreas Fabri 827e9fee8e fix Segmentation 2018-05-04 09:00:09 +02:00
Andreas Fabri 991f3847e8 Do not include graph_traits_Polyhedron.h, properties_polyhedron.h and Polyhedron_iostream.h 2018-05-03 13:23:50 +02:00
Laurent Rineau 0a74393dcf Commit all new dependencies files 2018-03-06 18:44:48 +01:00
Laurent Rineau 78e7060525 Merge pull request #2712 from afabri/CGAL-VC+warnlevel_4-GF 
Deal with VC++ warnings of level /W4
 2018-02-19 14:27:06 +01:00
Sébastien Loriot 483f69728e Refresh branch 2018-02-12 22:21:38 +01:00
Maxime Gimeno 688b5dd06e Move dependencies creation to package_info and add dependencies to git 2018-02-02 12:08:05 +01:00
Maxime Gimeno 8bde832931 Fix METIS headers in BGL 2018-02-02 12:08:05 +01:00
Maxime Gimeno a676d5a60e Try to fix errors in classification checks 2018-02-02 12:08:05 +01:00
Maxime Gimeno acd0a72edf Modify travis script to test dependencies 2018-02-02 12:08:05 +01:00
Maxime Gimeno ae36b452bc Add dependencies of all packages 2018-02-02 12:08:05 +01:00
Andreas Fabri f723c527e1 Surface_mesh_shortest_path 2018-01-17 21:56:19 +00:00
Simon Giraudot 1b25f47f95 Small bugfix (stop criteria if flow goes to 0) 2018-01-12 14:15:00 +01:00
Sébastien Loriot 8fc5756cc3 de-duplicate identical labels 2018-01-10 12:13:48 +01:00
Laurent Rineau 3c6640bf59 Merge pull request #1436 from lrineau/CGAL-new_cmake-GF 
Renewal of CMake scripts: header-only, ctest, CMake>=3.1

# Conflicts:
#	Installation/config/testfiles/CGAL_CFG_NESTED_CLASS_FRIEND_DECLARATION_BUG.cpp
 2017-12-05 18:20:05 +01:00
Sébastien Loriot 8cdfad0d08 add missing URL and Id tags 2017-11-15 22:58:57 +01:00
Laurent Rineau a9365554c9 Merge pull request #2550 from sloriot/CGAL-add_SPDX_tags 
Add SPDX License Identifier
 2017-11-15 16:48:27 +01:00
Laurent Rineau 86fb40832a Merge pull request #2580 from lrineau/CGAL-Support_CMake_3.10-GF 
Renew the handle of policies, for CMake-3.10
 2017-11-13 12:01:39 +01:00
Laurent Rineau c6068691fa Merge pull request #2547 from lrineau/CMake-parse_CTest_XML_output-lrineau 
CGAL testsuite implemented with CTest plus Python (part.1)
 2017-11-13 11:13:54 +01:00
Sébastien Loriot 5ea5bc95fd make maxflow header compatible with the license checking mecanism 2017-11-12 10:21:35 +01:00
Sébastien Loriot ee57fc2d6c add SPDX identifier for files under the GPL-3+ license 2017-11-12 10:17:51 +01:00
Laurent Rineau 62c70d41ca Renew the handle of policies, for CMake-3.10 
Now that we require CMake>=3.1, we can forget a lot of old CMake policies.

`CMP0053` `OLD` behavior is still needed, because of a bug in Qt5 CMake files, but it will
not be set with CMake>=3.10. Let's assume that a recent CMake version means
a recent Qt5 version.
 2017-11-06 14:58:36 +01:00
Laurent Rineau 74d49355fa Merge pull request #2449 from sloriot/SMSeg-maxflow_macros 
Fix compilation issue with boost 1.65
 2017-10-11 19:18:08 +02:00
Laurent Rineau 479c9d7105 Merge pull request #2449 from sloriot/SMSeg-maxflow_macros 
Fix compilation issue with boost 1.65
 2017-10-11 19:11:21 +02:00
Sébastien Loriot 0b97c247bf update macro names and undef them when leaving the file 2017-09-20 16:47:53 +02:00
Simon Giraudot 8043d342e7 Merge branch 'Classification-GF-old' into Classification-GF 2017-07-21 12:06:19 +02:00
Simon Giraudot 4b245f961e Merge branch 'Classification-GF-old' into Classification-GF 2017-07-10 09:06:26 +02:00
Guillaume Damiand 821a5bad4b Add missing return 2017-06-28 09:42:48 -04:00
Guillaume Damiand 013f447395 Merge branch 'master' into BGL-LCC-gdamiand 2017-06-22 23:21:39 +02:00
Guillaume Damiand c8250c4570 Merge branch 'master' into BGL-LCC-gdamiand 2017-06-15 10:03:53 -04:00
Guillaume Damiand f5a94891bb Update examples and demo that use BGL for LCC. 2017-06-14 11:42:15 -04:00
Sébastien Loriot 6d2526499e replace iterators of face patch indices by a range 2017-05-30 15:09:42 +02:00
Sébastien Loriot b4194e3614 import API and documentation 2017-05-30 15:09:42 +02:00
Maxime Gimeno 3ab2f10997 replace remaining 'componant' by 'patch' 2017-05-30 15:09:42 +02:00
Maxime Gimeno 1f96262d3d Rename the graph into Face_filtered_graph and add a function to check its validity. 2017-05-30 15:09:42 +02:00
Maxime Gimeno 1caba59404 add a function to change the current connected component ids to the cc_graph and update Segmentation example. 2017-05-30 15:09:42 +02:00
Maxime Gimeno 64eb2d09c6 Change doc for default index maps and add an example to Surface_mesh_segmentation using area() and Connected_components_graphs. 2017-05-30 15:09:41 +02:00
Laurent Rineau 7498ca9405 Merge pull request #2090 from afabri/Surface_mesh_segmentation-Surface_mesh_examples-GF 
Surface_mesh_segmentation: Add a Surface_mesh example at the end of the user manual
 2017-05-29 11:17:35 +02:00
Laurent Rineau b037471750 Merge pull request #2075 from afabri/CGAL-dont_include_graph_traits_header-GF 
Do not include graph_traits_{Polyhedron | Surface_mesh}.h
 2017-05-19 10:28:38 +02:00
Guillaume Damiand 885ef4775a Update examples and tests following renaming of BGL LCC helpers. 2017-05-10 16:20:11 -04:00
Andreas Fabri 94eedd3d72 Add the Surface_mesh example at the end of the user manual - Somehow unlucky, but better than nothing 2017-04-28 18:03:26 +02:00
Andreas Fabri 1dbedb7391 fix choices of std::cerr or std::cout 2017-04-27 09:04:12 +02:00
Andreas Fabri 1433a9f780 write to std::cout and not std:cerr 2017-04-25 14:46:23 +02:00