Commit Graph

1290 Commits

Author SHA1 Message Date
Laurent Rineau 1c2e9df8cf Merge branch 'releases/CGAL-4.11-branch' 2017-12-19 16:29:10 +01:00
Laurent Rineau 5181cd7474 Merge branch 'releases/CGAL-4.10-branch' into releases/CGAL-4.11-branch
# Conflicts:
#	Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/measure.h
2017-12-19 16:19:22 +01:00
Sébastien Loriot 082d9005da use reference type of the pmap 2017-12-08 14:45:54 +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
Laurent Rineau 1296d83552 Fix the warning about CMP0023 2017-11-28 14:27:29 +01:00
Sébastien Loriot 8cdfad0d08 add missing URL and Id tags 2017-11-15 22:58:57 +01:00
Laurent Rineau 0681ac6dbc Fix the TBB_USE_FILE warnings 2017-11-15 17:00:02 +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 037d1149f5 Merge pull request #2477 from sgiraudot/Polyhedron_demo-Fix_load_ply_empty_soup-GF
Polyhedron demo: several fixes and enhancements for PLY I/O
2017-10-13 16:54:19 +02:00
Laurent Rineau 7e9f756935 Replace all std::unary_function by CGAL::unary_function 2017-10-04 15:57:09 +02:00
Simon Giraudot 813f128e57 Add method to recover comments of PLY input 2017-10-04 09:30:01 +02:00
Simon Giraudot 38663431a1 Merge branch 'Classification-GF-old' into Classification-GF 2017-09-11 11:53:13 +02:00
Laurent Rineau 0c30b8697a Merge pull request #2374 from afabri/CGAL-links-GF
PSP, PMP: Fix some \ref
2017-09-04 15:09:08 +02:00
Laurent Rineau 0595de07c2 Merge pull request #2370 from sgiraudot/PLY_reader-Fix_face_properties_bug-GF
PLY reader: Fix face properties bug
2017-09-04 15:08:51 +02:00
Laurent Rineau 65d4b9243b Merge pull request #2372 from afabri/PSP-add-author-GF
Point Set Processing: Add authors
2017-08-28 12:49:39 +02:00
Andreas Fabri db67979b71 fix some \ref so that the links go to the package overview 2017-08-25 14:14:01 +01:00
Andreas Fabri 74b88b2ee0 Add Florent and Simon as author of the structuring function 2017-08-25 14:43:24 +02:00
Simon Giraudot 6c4b27c743 Merge branch 'Classification-GF-old' into Classification-GF 2017-08-25 14:28:10 +02:00
Simon Giraudot 1e4b63c606 Fix face properties bug 2017-08-24 11:42:29 +02:00
Sebastien Loriot 74409b2b3c Merge pull request #2239 from sgiraudot/Shape_detection-Region_growing-GF
Region Growing (Shape Detection)
2017-08-18 16:27:19 +02:00
Simon Giraudot 335abd45dd Fix warnings 2017-08-14 09:58:33 +02:00
Simon Giraudot 50b618d801 Fix typename warnings 2017-08-11 10:07:11 +02:00
Simon Giraudot 86e5ad850b Add method to test if tag exists for list property 2017-08-09 09:48:21 +02:00
Simon Giraudot 63732f6415 Remove useless and error-prone overload with std::size_t 2017-08-04 10:03:29 +02:00
Simon Giraudot 8999312f16 Fix reference forwarding everywhere 2017-08-02 14:10:44 +02:00
Simon Giraudot 45ffa0af52 Fix reference forwarding (+ property map error) 2017-08-02 14:10:44 +02:00
Simon Giraudot f0e03e997a Some more internal adaptions of read_ply_points 2017-08-02 14:10:44 +02:00
Simon Giraudot 8556215aae Explicit cast 2017-08-02 14:10:43 +02:00
Simon Giraudot 89d610f047 Add functions to write PLY list properties 2017-08-02 14:10:42 +02:00
Simon Giraudot 71be7b4935 Generalize and simplify generation of PLY properties macro 2017-08-02 14:10:42 +02:00
Simon Giraudot c190be7993 Add methods to handle PLY lists 2017-08-02 14:10:41 +02:00
Simon Giraudot 7de200fffa Bugfix: update structuring test with new API 2017-08-02 13:45:10 +02:00
Simon Giraudot 4c99c7be33 Fix doc 2017-08-01 15:47:58 +02:00
Simon Giraudot be69b2bdd9 Update doc and API 2017-08-01 15:47:58 +02:00
Simon Giraudot 6a119fef11 Unify APIs of structuring and regularization 2017-08-01 15:47:58 +02:00
Simon Giraudot 85634b7a27 Change structure_point_set() with generalized API 2017-08-01 15:46:04 +02:00
Simon Giraudot b88deb3759 Rename Efficient_RANSAC_traits as Shape_detection_traits (same for concept) 2017-08-01 15:45:06 +02:00
Simon Giraudot 8043d342e7 Merge branch 'Classification-GF-old' into Classification-GF 2017-07-21 12:06:19 +02:00
Simon Giraudot c59454e45f Fix wrong inclusions/warning protections 2017-07-13 10:36:56 +02:00
Simon Giraudot 41edf00aae Deactivate visual studio warning on LASlib DLL 2017-07-12 08:13:41 +02:00
Simon Giraudot eed458b143 Fix binary write bug 2017-07-11 11:58:54 +02:00
Jane Tournois b4bf70caf2 use the import instruction of LasReader_LAS 2017-07-11 11:58:54 +02:00
Jane Tournois dce27d7ecc add missing includes 2017-07-11 11:58:54 +02:00
Simon Giraudot 238f3afd70 Fix: use cpp11::tuple in examples 2017-07-11 11:58:54 +02:00
Simon Giraudot fbe9e78ef0 Use std:: everywhere for tuples (make_tuple, get, etc.) 2017-07-11 11:58:54 +02:00
Simon Giraudot 955100bb48 Force using std::tuple 2017-07-11 11:58:54 +02:00
Simon Giraudot b3723b7e3d Document needed specialization of Output_rep 2017-07-11 11:58:53 +02:00
Simon Giraudot e01f62a09f Use Output_rep to output colors 2017-07-11 11:58:53 +02:00
Simon Giraudot 3449599f59 Simplify CMakeLists 2017-07-11 11:58:53 +02:00
Simon Giraudot 4b3a506d44 Fix detection of required C++11 features 2017-07-11 11:58:53 +02:00
Simon Giraudot a644f31cd9 Include CGAL/config.h to test macros 2017-07-11 11:58:53 +02:00
Simon Giraudot 40ae0436e1 Add C++11 conditions/tests/warnings for LAS and PLY IO functions and related files 2017-07-11 11:58:53 +02:00
Simon Giraudot d118bc7600 Add license headers 2017-07-11 11:58:52 +02:00
Simon Giraudot bd94c3005b Move USE_AS_DLL as a temporary definition around LASlib header 2017-07-11 11:58:52 +02:00
Jane Tournois 20b069852d ifstream should have binary mode 2017-07-11 11:58:52 +02:00
Simon Giraudot 622bb6f691 Replace LAS_property classes using a Base class with templated types 2017-07-11 11:58:51 +02:00
Jane Tournois 5fb14a891a extract #include in non-GNUC context 2017-07-11 11:58:51 +02:00
Simon Giraudot 0354290268 Fix forgotten namespaces changes 2017-07-11 11:58:51 +02:00
Simon Giraudot 32bd5265dd Use cpp11::tuple and cpp11::get instead of std::tuple and std::get 2017-07-11 11:58:51 +02:00
Simon Giraudot d4f6db6234 Fix typo in example comments 2017-07-11 11:58:51 +02:00
Simon Giraudot 7377073ab6 Fix wrong namespace in example (std -> CGAL) 2017-07-11 11:58:51 +02:00
Simon Giraudot 4f13792fa7 Fix typo 2017-07-11 11:58:51 +02:00
Simon Giraudot ce362930f0 Separate PSP functions in groups 2017-07-11 11:58:51 +02:00
Simon Giraudot 0d1d7e896b Fix case 2017-07-11 11:58:51 +02:00
Simon Giraudot 8749fc9cf0 Reorganize ref manual 2017-07-11 11:58:50 +02:00
Simon Giraudot 432a4fdd71 Update example with change of API 2017-07-11 11:58:50 +02:00
Simon Giraudot 61f1276a07 Update API with review (remove PLY/LAS namespaces) 2017-07-11 11:58:50 +02:00
Simon Giraudot 723318eaa2 Fix PLY/LAS false links 2017-07-11 11:58:50 +02:00
Simon Giraudot 237a19037b Some corrections in the manual 2017-07-11 11:58:50 +02:00
Simon Giraudot 45d0670b22 Uppercase words in package description 2017-07-11 11:58:50 +02:00
Simon Giraudot 5027c9af2c Some corrections 2017-07-11 11:58:49 +02:00
Simon Giraudot ffd7af06ef Some typo corrections 2017-07-11 11:58:49 +02:00
Simon Giraudot 4027ef814c Capitalize tag classes 2017-07-11 11:58:49 +02:00
Simon Giraudot cb6e739f0e Replace namespaces Ply/Las to PLY/LAS 2017-07-11 11:58:49 +02:00
Simon Giraudot 249aa8ae0f Add example to doc 2017-07-11 11:58:49 +02:00
Simon Giraudot d0b760a9e2 User and reference manuals 2017-07-11 11:58:49 +02:00
Simon Giraudot ced26cc733 First version of LAS writer 2017-07-11 11:58:49 +02:00
Simon Giraudot f4fea04a4d Add definition CGAL_LINKED_WITH_LASLIB 2017-07-11 11:58:48 +02:00
Simon Giraudot 952c5a4984 Some corrections 2017-07-11 11:58:48 +02:00
Simon Giraudot 9ff95550e9 Use CGAL::IO::BINARY instead of a Binary template boolean 2017-07-11 11:58:48 +02:00
Simon Giraudot 20b8baabbe Update examples 2017-07-11 11:58:48 +02:00
Simon Giraudot 54b7ef95ea Add all possible types for PLY header 2017-07-11 11:58:48 +02:00
Simon Giraudot 7686ad5280 Update example for LAS reader 2017-07-11 11:58:48 +02:00
Simon Giraudot 0bb283cbbd Add new example for PLY reading 2017-07-11 11:58:48 +02:00
Simon Giraudot 9175f39c86 Use cpp11::tuple instead of std::tuple 2017-07-11 11:58:48 +02:00
Simon Giraudot 5663a6836f Change API of PLY writer similarly to PLY reader 2017-07-11 11:58:48 +02:00
Simon Giraudot c394369d29 Update doc, examples and API 2017-07-11 11:58:48 +02:00
Simon Giraudot 24b1a690f3 Use empty structs to handle attributes 2017-07-11 11:58:47 +02:00
Simon Giraudot a79d7be088 New example for LAS reader 2017-07-11 11:58:47 +02:00
Simon Giraudot d827e9d65d First version of LAS reader 2017-07-11 11:58:47 +02:00
Simon Giraudot be1c5b22ae Update doc 2017-07-11 11:58:47 +02:00
Simon Giraudot 40e901fa4b Update example with new API of PLY reader 2017-07-11 11:58:47 +02:00
Simon Giraudot 731b4c27fe Change full API of PLY reader 2017-07-11 11:58:47 +02:00
Simon Giraudot 19f09d634b Changing API of PLY reader: first steps 2017-07-11 11:58:47 +02:00
Simon Giraudot ef57586cb8 Add read_las_points.h file with skeleton of functions 2017-07-11 11:58:47 +02:00
Simon Giraudot 4b245f961e Merge branch 'Classification-GF-old' into Classification-GF 2017-07-10 09:06:26 +02:00
Sébastien Loriot 899aa974b1 add Simon as a maintainer of PSP 2017-06-15 09:40:38 +02:00
Simon Giraudot 3ce8e9fc64 Merge branch 'Classification-GF-old' into Classification-GF 2017-03-13 07:51:54 +01:00
Laurent Rineau f60275ff28 Merge pull request #1933 from janetournois/Polyhedron_demo-fix_warnings_msvc-jtournois
Polyhedron demo : fix warnings
2017-03-02 16:55:15 +01:00
Jane Tournois 60fd6aa27a fix conversion warning for msvc 2013, 32 bits 2017-02-28 10:32:03 +01:00
Simon Giraudot b7a0c704d5 Revert changes from std::floor to cast (risk of overflow) 2017-02-27 14:27:12 +01:00
Simon Giraudot 93f5f6276e Replace set by unordered_set (speed up 70%) 2017-02-27 09:57:18 +01:00
Simon Giraudot 0d92e5f2e1 Use cast to int instead of std::round without constructing Point (speed up 25%) 2017-02-27 09:33:43 +01:00
Laurent Rineau c8530ed22d Merge pull request #1909 from sgiraudot/Point_set_processing-Wlop_bugfix_radius2-GF
WLOP Bugfix: use radius2 in parallel version too
2017-02-16 17:34:23 +01:00
Simon Giraudot 57de2171ce Bugfix: use radius2 in parallel version too 2017-02-16 16:44:26 +01:00
Sébastien Loriot 50510c05ea add include directive for license of all GPL header files
done using:
ack-grep "^GPL" */package_info/*/license.txt -l | awk -F "/" '{print $1}' > /tmp/gpl_packages
for i in `cat /tmp/gpl_packages | \
          grep -v Operations_on_polyhedra | \
          grep -v Algebraic_kernel_for_circles | \
          grep -v Algebraic_kernel_for_spheres | \
          grep -v Polyhedron_IO`;
do
  echo $i
  python Scripts/developer_scripts/add_license_in_pkg_header.py $i
done
python Scripts/developer_scripts/add_license_in_pkg_header.py Operations_on_polyhedra Polygon_mesh_processing
python Scripts/developer_scripts/add_license_in_pkg_header.py Algebraic_kernel_for_circles Circular_kernel_2
python Scripts/developer_scripts/add_license_in_pkg_header.py Algebraic_kernel_for_spheres Circular_kernel_3
python Scripts/developer_scripts/add_license_in_pkg_header.py Polyhedron_IO Polyhedron
2017-01-19 15:20:25 +01:00
Laurent Rineau 5334088336 Merge pull request #1811 from sloriot/Property_map-std_tuple_support
make Nth_of_tuple_property_map compatible with std::tuple
2017-01-12 11:12:24 +01:00
Laurent Rineau e92b880309 Merge pull request #1810 from afabri/PSP-VC32bit_suppress_warning-GF
Point Set Structuring: Suppress warnings for VC 32bit
2017-01-12 11:12:11 +01:00
Andreas Fabri 4e7201dcfe Suppress warning in PSP/example CMakeLists.txt 2017-01-11 17:44:14 +01:00
Maxime Gimeno a01593e0bb Unify the links to the Polyhedron demo in the package descriptions. 2017-01-10 14:56:52 +01:00
Sébastien Loriot 1a6973c48e make Nth_of_tuple_property_map compatible with std::tuple 2017-01-10 10:37:18 +01:00
Andreas Fabri 5122473d27 Suppress warnings for VC 32bit compilation in 2 CMakeLists.txt 2017-01-10 10:16:55 +01:00
Simon Giraudot 1beb340550 Merge branch 'Point_set_3-GF-old' into Point_set_3-GF 2017-01-03 15:23:23 +01:00
Sébastien Loriot 303ee311be Merge pull request #1776 from sgiraudot/Point_set_processing-Automatic_scale_selection-GF
Automatic Scale Selection
2017-01-02 19:10:22 +01:00
Sébastien Loriot 3d637745fe Merge pull request #1633 from sgiraudot/Point_set_processing_3-Point_set_structuring-GF
Point Set Structuring
2017-01-02 19:10:14 +01:00
Simon Giraudot 3fe7678874 Warning fix: forgot to remove pragma warning pop 2017-01-02 07:53:18 +01:00
Sébastien Loriot fe5e925367 Merge pull request #1701 from afabri/Convex_hull_3-FaceGraph-GF
Convex_hull_3: Switch to FaceGraph
2016-12-30 15:14:34 +01:00
Simon Giraudot 136a4806e8 Fix warning on Windows 32bits: use boost::intmax_t for difference 2016-12-30 14:30:06 +01:00
Andreas Fabri ab78464470 Fix VC++ min/max problem 2016-12-30 10:59:07 +01:00
Simon Giraudot 5edb6e1459 Warning fix: explicit conversion from size_t to unsigned int 2016-12-30 07:38:44 +01:00
Simon Giraudot d423e5e6f8 Fix warning with explicit casts 2016-12-29 09:28:36 +01:00
Simon Giraudot 2a37790e47 Add license header 2016-12-21 13:50:18 +01:00
Simon Giraudot fb9aae74c6 Merge branch 'Point_set_processing-Automatic_scale_selection-GF-old' into Point_set_processing-Automatic_scale_selection-GF 2016-12-21 13:06:36 +01:00
Andreas Fabri 552e8f9de6 Use halfspace intersection that has better vertex coordinates (even if the topology of the CH might not be fuly correct) 2016-12-01 12:54:19 +01:00
Andreas Fabri 466995a31b Add typedef for Polyhedron_3 2016-11-30 11:56:52 +01:00
Andreas Fabri 86a252c074 min -> (min) ; std::fabs -> CGAL::abs 2016-11-30 08:11:30 +01:00
Simon Giraudot 0d0e28ea68 Bugfix: do not delegate constructor 2016-11-28 08:02:56 +01:00
Simon Giraudot 310d81864e Merge branch 'Classification-GF-old' into Classification-GF 2016-11-23 08:55:57 +01:00
Simon Giraudot 0df67413eb Fix EfficientRANSACTraits requirements 2016-10-31 15:11:55 +01:00
Simon Giraudot db30ed1a82 Update with remarks from code review 2016-10-31 12:38:18 +01:00
Simon Giraudot fad329db29 Update example with API 2016-10-31 09:00:26 +01:00
Simon Giraudot 94b2fe7206 Better API: fulfill at least one of the threshold 2016-10-31 08:59:57 +01:00
Simon Giraudot 2d325b958a Document property maps and add alternative 2016-10-31 07:57:35 +01:00
Simon Giraudot 0ca9eccec8 Bugfix: missing typename 2016-10-31 07:47:26 +01:00
Simon Giraudot 40e273d5af Add possibility to give custom point_map and normal_map 2016-10-28 15:30:50 +02:00
Simon Giraudot f65db046b1 Merge branch 'Point_set_processing_3-Point_set_structuring-GF-old' into Point_set_processing_3-Point_set_structuring-GF 2016-10-28 15:02:48 +02:00
Simon Giraudot f684295bde Update remove_outlier example with change of API 2016-10-28 11:19:29 +02:00
Simon Giraudot b6f68584fa Change API of remove_outliers: add distance based threshold 2016-10-28 11:19:10 +02:00
Simon Giraudot 22f0b2c1f8 Merge branch 'Point_set_3-GF-old' into Point_set_3-GF 2016-10-24 15:17:38 +02:00
Simon Giraudot 886ad42a7e Add method to get raw readers 2016-10-21 10:28:39 +02:00
Simon Giraudot 8e67eb7dd2 Separate examples in 2 sections 2016-10-14 09:12:21 +02:00
Laurent Rineau 223c1cf5a4 Merge pull request #1530 from lrineau/Installation-compute_dependencies-GF
Compute and fix packages dependencies
2016-10-05 13:11:04 +02:00
Laurent Rineau 9a0bb54922 Merge pull request #1438 from sloriot/CGAL-clean_up_projects_name_cmake
Clean up projects name in cmake scripts
2016-10-05 13:02:25 +02:00
Laurent Rineau 50675b9734 Merge pull request #1418 from afabri/Point_set_processing-static-GF
PSP: No need for thread local storage as readonly
2016-10-05 13:02:13 +02:00
Laurent Rineau 51f5697d3d Add missing #include 2016-09-30 15:23:14 +02:00
Andreas Fabri ed472c0904 Fix package Point_set_processing_3: include headers 2016-09-30 15:22:30 +02:00
Andreas Fabri 5136f5dda4 Fix package Point_set_processing: Add #include and rename variable _N -> N 2016-09-30 15:22:27 +02:00
Simon Giraudot 65910da1a6 Merge branch 'Point_set_3-GF-old' into Point_set_3-GF 2016-09-28 11:25:36 +02:00
Simon Giraudot 3a356505c8 Merge branch 'Point_set_3-GF' into Point_set_classification-GF 2016-09-21 09:42:41 +02:00
Simon Giraudot 401fa82461 Merge branch 'Point_set_classification-GF-old-old' into Point_set_classification-GF-old 2016-09-21 09:38:27 +02:00