Commit Graph

81 Commits

Author SHA1 Message Date
Laurent Rineau 9ece40051e Merge pull request #4437 from sgiraudot/Point_set_3-Fix_missing_copy_constructor-GF
Point_set_3: add missing copy constructor
2020-01-15 17:19:25 +01:00
Simon Giraudot e728b74ad6 Point_set_3: add missing copy constructor 2019-12-30 16:42:05 +01: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
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 560c77f567 rename named function parameter class 2019-07-15 06:25:02 +02:00
Sébastien Loriot 983645a51a match @{ and @} 2019-07-05 21:49:46 +02:00
Andreas Fabri e2d19b0c8d Replace NULL and Nullptr_t with nullptr and nullptr_t 2019-06-04 23:45:44 +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 f5836b2206 Merge branch 'releases/CGAL-4.13-branch' 2019-03-07 14:31:16 +01:00
Sébastien Loriot 3887a21429 add missing text for brief of advanced class/type/function/concept 2019-03-05 08:01:17 +01:00
Simon Giraudot 458e1c7b80 Update with change of ref tag 2019-02-07 11:36:05 +01:00
Simon Giraudot 8c0417b6c5 Document garbage_size() properly 2019-02-07 11:36:04 +01:00
Simon Giraudot 1b7a2eb2c5 Replace cancel_removal() by cancel_removals() 2019-02-07 11:36:04 +01:00
Simon Giraudot ee2d6eb3ab Add useful typedefs of templates of Point_set_3 2019-02-07 11:36:04 +01:00
Simon Giraudot 776a8b735c Fix doc note about iterator invalidations 2019-02-07 11:36:04 +01:00
Simon Giraudot 6a016e4c27 Update user manual 2019-02-07 11:36:04 +01:00
Simon Giraudot 6f2eed5540 Add method to get properties and types as string 2019-02-07 11:36:04 +01:00
Simon Giraudot f778e5e151 Add methods to easily transfer properties from one point set to another 2019-02-07 11:36:04 +01:00
Simon Giraudot ed748c8ce9 Unify API of add_normal_map() with add_property_map() 2019-02-07 11:34:56 +01:00
Simon Giraudot e11e12b69f Better remove() / is_removed() methods 2019-02-07 11:34:56 +01:00
Sébastien Loriot 2f9408f867 rename link name to match package name 2018-10-08 10:28:55 +02:00
Sébastien Loriot a2e8a1c68f add the suffix Ref to doxygen link to reference 2018-10-08 10:26:56 +02:00
Simon Giraudot effb28cdf2 Fix insertion method, keeping the index 2018-09-06 09:58:49 +02:00
Simon Giraudot c52b32b744 Add trick to get FT right for general PointRange AND for CGAL::Point_set_3 2018-01-11 14:04:19 +01:00
Simon Giraudot 0e81f39e07 Document parameters() in CGAL::Point_set_3 2018-01-10 16:39:32 +01:00
Simon Giraudot fffefbaeaf add all_default() method with point set 3 overload 2018-01-10 16:38:36 +01:00
Laurent Rineau 1c2e9df8cf Merge branch 'releases/CGAL-4.11-branch' 2017-12-19 16:29:10 +01:00
Simon Giraudot 9a7f07cd1d Reinitialize properties of Point_set_3 2017-12-08 10:18:09 +01:00
Sébastien Loriot ee57fc2d6c add SPDX identifier for files under the GPL-3+ license 2017-11-12 10:17:51 +01:00
Simon Giraudot a61d6e02a4 Fix Point_set_3::remove(const Index&) and add test 2017-07-04 15:18:51 +02:00
Simon Giraudot 800c16f2e1 Warning fix: explicit conversion to size_type 2017-04-07 11:49:59 +02:00
Simon Giraudot af78f66230 Use boost::uint32_t instead of std::size_t as size type 2017-04-05 15:29:53 +02:00
Simon Giraudot 4cfbe98564 Point_set_3: fix documentation bug (concept Index accepts constructor with std::size_t) 2017-04-05 15:18:28 +02:00
Laurent Rineau 7b2a150e84 Fix <CGAL/Surface_mesh/Properties.h> and its uses
The PR #1791 introduced `CGAL::Point_set_3`, and factorized the
`Property_map` implementation of `Surface_mesh` into a new class
template `CGAL::Properties::Property_map<Key, T>`.

The backward compatibility was supposed to be ensured by the fact that
`Surface_mesh<Point>::Property_map<Key,T>` had
`Properties::Property_map<Key, T>` as base class. But that compatibility
was only partial, and there could be ambiguities in the calls to `get`
and `put` with those property maps.

This commit/PR renamed `Properties::Property_map` to
`Properties::Property_map_base`, and added a third parameter, used as
the `Derived` class in the CRTP used by `boost::put_get_helper`. That
way, the `get` and `put` functions are defined directory on the real
class `Surface_mesh::Property_map<Key, T>` and not on its base class.

The same has been modified in `CGAL::Point_set_3`.

That makes the use of `Property_base_base` and `Property_container` a
little trickier, but that removes several ugly non-portable hacks, like
the `reinterpret_cast` that were used to convert a pointer to base class
of the pmap to the pointer the real pmap. Now that is a lot cleaner.

I have verified that the documentation is not modified. Actually, the
PR #1791 did modify the documentation of `Surface_mesh` (see the member
method `add_property_map` for example), and this PR fixes the situation:
the documentation of `Surface_mesh` is put back to the version in
CGAL-4.9.
2017-02-08 14:33:18 +01:00
Simon Giraudot d7eb45c37b Bugfix: point is marked as removed if iterator distance is lesser OR equal to 0 2017-01-30 08:45:22 +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
Simon Giraudot 5b7dea069e Two bug fixes 2016-10-18 15:39:51 +02:00
Simon Giraudot bdbd31ee11 Bugfix: do not define the prototype of Push_property_map beforehand 2016-10-18 15:27:38 +02:00
Simon Giraudot 17b25a50ac Update with latest review 2016-10-14 14:31:06 +02:00
Simon Giraudot 69c6f96727 Fix properties() behavior 2016-10-12 12:16:03 +02:00
Simon Giraudot 8a18e754be Fix boost demangle 2016-10-12 11:33:10 +02:00
Simon Giraudot 3a24b788c4 Fix some warnings/errors from testsuite 2016-10-12 10:36:57 +02:00
Simon Giraudot 6b17b65705 Update manual with latest review 2016-10-12 09:18:45 +02:00
Simon Giraudot 60377f2f10 Bugfix: update outdated method name 2016-10-11 14:22:34 +02:00
Simon Giraudot 8fbacbcf11 Add clear_properties() method 2016-10-11 09:08:58 +02:00
Simon Giraudot 62578b554c Update doc with latest review 2016-10-11 08:54:27 +02:00
Simon Giraudot e877b0f688 Move stream operators to IO 2016-09-28 11:15:29 +02:00