songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use standard deprecation tools + minor fixes

This commit is contained in:
Simon Giraudot 2017-12-14 10:06:43 +01:00
parent 210bb83123
commit 1fa899760f
25 changed files with 189 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Point_set_processing_3/include/CGAL/IO/read_las_points.h
View File

@ -516,15 +516,16 @@ read_las_points(
(stream, output, CGAL::parameters::all_default());
}
#ifndef CGAL_NO_DEPRECATED_CODE
// deprecated API
template < typename OutputIteratorValueType,
typename OutputIterator,
typename PointMap >
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::read_las_points(), please update your code")
bool read_las_points(std::istream& stream, ///< input stream.
OutputIterator output, ///< output iterator over points.
PointMap point_map) ///< property map: value_type of OutputIterator -> Point_3.
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("read_las_points()");
return read_las_points<OutputIteratorValueType>
(stream, output,
CGAL::parameters::point_map (point_map));
@ -533,15 +534,16 @@ bool read_las_points(std::istream& stream, ///< input stream.
// deprecated API
template < typename OutputIterator,
typename PointMap >
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::read_las_points(), please update your code")
bool read_las_points(std::istream& stream, ///< input stream.
OutputIterator output, ///< output iterator over points.
PointMap point_map) ///< property map: value_type of OutputIterator -> Point_3.
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("read_las_points()");
return read_las_points<typename value_type_traits<OutputIterator>::type>
(stream, output,
CGAL::parameters::point_map (point_map));
}
#endif // CGAL_NO_DEPRECATED_CODE
/// \endcond

23
Point_set_processing_3/include/CGAL/IO/read_off_points.h
View File

@ -226,6 +226,7 @@ read_off_points(
(stream, output, CGAL::parameters::all_default());
}
#ifndef CGAL_NO_DEPRECATED_CODE
// deprecated API
template <typename OutputIteratorValueType,
typename OutputIterator,
@ -233,6 +234,7 @@ template <typename OutputIteratorValueType,
typename NormalPMap,
typename Kernel
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::read_off_points_and_normals(), please update your code")
bool
read_off_points_and_normals(
std::istream& stream, ///< input stream.
@ -241,7 +243,6 @@ read_off_points_and_normals(
NormalPMap normal_map, ///< property map: value_type of OutputIterator -> Vector_3.
const Kernel& /*kernel*/) ///< geometric traits.
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("read_off_points_and_normals()");
return read_off_points<OutputIteratorValueType>
(stream, output,
CGAL::parameters::point_map (point_map).
@ -255,6 +256,7 @@ template <typename OutputIterator,
typename NormalPMap,
typename Kernel
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::read_off_points_and_normals(), please update your code")
bool
read_off_points_and_normals(
std::istream& stream, ///< input stream.
@ -263,7 +265,6 @@ read_off_points_and_normals(
NormalPMap normal_map, ///< property map: value_type of OutputIterator -> Vector_3.
const Kernel& kernel) ///< geometric traits.
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("read_off_points_and_normals()");
return read_off_points<typename value_type_traits<OutputIterator>::type>
(stream, output,
CGAL::parameters::point_map (point_map).
@ -277,6 +278,7 @@ template <typename OutputIteratorValueType,
typename PointPMap,
typename NormalPMap
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::read_off_points_and_normals(), please update your code")
bool
read_off_points_and_normals(
std::istream& stream, ///< input stream.
@ -284,7 +286,6 @@ read_off_points_and_normals(
PointPMap point_map, ///< property map: value_type of OutputIterator -> Point_3.
NormalPMap normal_map) ///< property map: value_type of OutputIterator -> Vector_3.
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("read_off_points_and_normals()");
return read_off_points<OutputIteratorValueType>
(stream, output,
CGAL::parameters::point_map (point_map).
@ -296,6 +297,7 @@ template <typename OutputIterator,
typename PointPMap,
typename NormalPMap
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::read_off_points_and_normals(), please update your code")
bool
read_off_points_and_normals(
std::istream& stream, ///< input stream.
@ -303,7 +305,6 @@ read_off_points_and_normals(
PointPMap point_map, ///< property map: value_type of OutputIterator -> Point_3.
NormalPMap normal_map) ///< property map: value_type of OutputIterator -> Vector_3.
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("read_off_points_and_normals()");
return read_off_points<typename value_type_traits<OutputIterator>::type>
(stream, output,
CGAL::parameters::point_map (point_map).
@ -315,13 +316,13 @@ template <typename OutputIteratorValueType,
typename OutputIterator,
typename NormalPMap
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::read_off_points_and_normals(), please update your code")
bool
read_off_points_and_normals(
std::istream& stream, ///< input stream.
OutputIterator output, ///< output iterator over points.
NormalPMap normal_map) ///< property map: value_type of OutputIterator -> Vector_3.
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("read_off_points_and_normals()");
return read_off_points<OutputIteratorValueType>
(stream, output,
CGAL::parameters::normal_map (normal_map));
@ -331,13 +332,13 @@ read_off_points_and_normals(
template <typename OutputIterator,
typename NormalPMap
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::read_off_points_and_normals(), please update your code")
bool
read_off_points_and_normals(
std::istream& stream, ///< input stream.
OutputIterator output, ///< output iterator over points.
NormalPMap normal_map) ///< property map: value_type of OutputIterator -> Vector_3.
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("read_off_points_and_normals()");
return read_off_points<typename value_type_traits<OutputIterator>::type>
(stream, output,
CGAL::parameters::normal_map (normal_map));
@ -349,6 +350,7 @@ template <typename OutputIteratorValueType,
typename PointPMap,
typename Kernel
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::read_off_points(), please update your code")
bool
read_off_points(
std::istream& stream, ///< input stream.
@ -356,7 +358,6 @@ read_off_points(
PointPMap point_map, ///< property map: value_type of OutputIterator -> Point_3.
const Kernel& kernel) ///< geometric traits.
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("read_off_points()");
return read_off_points<OutputIteratorValueType>
(stream, output,
CGAL::parameters::point_map (point_map).
@ -368,6 +369,7 @@ template <typename OutputIterator,
typename PointPMap,
typename Kernel
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::read_off_points(), please update your code")
bool
read_off_points(
std::istream& stream, ///< input stream.
@ -375,7 +377,6 @@ read_off_points(
PointPMap point_map, ///< property map: value_type of OutputIterator -> Point_3.
const Kernel& kernel) ///< geometric traits.
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("read_off_points()");
return read_off_points<typename value_type_traits<OutputIterator>::type>
(stream, output,
CGAL::parameters::point_map (point_map).
@ -387,13 +388,13 @@ template <typename OutputIteratorValueType,
typename OutputIterator,
typename PointPMap
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::read_off_points(), please update your code")
bool
read_off_points(
std::istream& stream, ///< input stream.
OutputIterator output, ///< output iterator over points.
PointPMap point_map) ///< property map: value_type of OutputIterator -> Point_3.
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("read_off_points()");
return read_off_points<OutputIteratorValueType>
(stream, output,
CGAL::parameters::point_map (point_map));
@ -403,18 +404,18 @@ read_off_points(
template <typename OutputIterator,
typename PointPMap
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::read_off_points(), please update your code")
bool
read_off_points(
std::istream& stream, ///< input stream.
OutputIterator output, ///< output iterator over points.
PointPMap point_map) ///< property map: value_type of OutputIterator -> Point_3.
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("read_off_points()");
return read_off_points<typename value_type_traits<OutputIterator>::type>
(stream, output,
CGAL::parameters::point_map (point_map));
}
#endif // CGAL_NO_DEPRECATED_CODE
/// \endcond

15
Point_set_processing_3/include/CGAL/IO/read_ply_points.h
View File

@ -854,17 +854,18 @@ read_ply_points(
(stream, output, CGAL::parameters::all_default());
}
#ifndef CGAL_NO_DEPRECATED_CODE
// deprecated API
template < typename OutputIteratorValueType,
typename OutputIterator,
typename PointMap,
typename NormalMap >
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::read_ply_points_and_normals(), please update your code")
bool read_ply_points_and_normals(std::istream& stream, ///< input stream.
OutputIterator output, ///< output iterator over points.
PointMap point_map, ///< property map: value_type of OutputIterator -> Point_3.
NormalMap normal_map) ///< property map: value_type of OutputIterator -> Vector_3.
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("read_ply_points_and_normals()");
return read_ply_points<OutputIteratorValueType>
(stream, output,
CGAL::parameters::point_map (point_map).
@ -875,12 +876,12 @@ bool read_ply_points_and_normals(std::istream& stream, ///< input stream.
template < typename OutputIterator,
typename PointMap,
typename NormalMap >
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::read_ply_points_and_normals(), please update your code")
bool read_ply_points_and_normals(std::istream& stream, ///< input stream.
OutputIterator output, ///< output iterator over points.
PointMap point_map, ///< property map: value_type of OutputIterator -> Point_3.
NormalMap normal_map) ///< property map: value_type of OutputIterator -> Vector_3.
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("read_ply_points_and_normals()");
return read_ply_points<typename value_type_traits<OutputIterator>::type>
(stream, output,
CGAL::parameters::point_map (point_map).
@ -891,23 +892,24 @@ bool read_ply_points_and_normals(std::istream& stream, ///< input stream.
template < typename OutputIteratorValueType,
typename OutputIterator,
typename NormalMap >
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::read_ply_points_and_normals(), please update your code")
bool read_ply_points_and_normals(std::istream& stream, ///< input stream.
OutputIterator output, ///< output iterator over points.
NormalMap normal_map) ///< property map: value_type of OutputIterator -> Vector_3.
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("read_ply_points_and_normals()");
return read_ply_points<OutputIteratorValueType>
(stream, output,
CGAL::parameters::normal_map (normal_map));
}
// deprecated API
template < typename OutputIterator,
typename NormalMap >
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::read_ply_points_and_normals(), please update your code")
bool read_ply_points_and_normals(std::istream& stream, ///< input stream.
OutputIterator output, ///< output iterator over points.
NormalMap normal_map) ///< property map: value_type of OutputIterator -> Vector_3.
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("read_ply_points_and_normals()");
return read_ply_points<typename value_type_traits<OutputIterator>::type>
(stream, output,
CGAL::parameters::normal_map (normal_map));
@ -918,13 +920,13 @@ template <typename OutputIteratorValueType,
typename OutputIterator,
typename PointMap
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::read_ply_points(), please update your code")
bool
read_ply_points(
std::istream& stream, ///< input stream.
OutputIterator output, ///< output iterator over points.
PointMap point_map) ///< property map: value_type of OutputIterator -> Point_3.
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("read_ply_points()");
return read_ply_points<OutputIteratorValueType>
(stream, output,
CGAL::parameters::point_map (point_map));
@ -933,15 +935,16 @@ read_ply_points(
// deprecated API
template < typename OutputIterator,
typename PointMap >
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::read_ply_points(), please update your code")
bool read_ply_points(std::istream& stream, ///< input stream.
OutputIterator output, ///< output iterator over points.
PointMap point_map) ///< property map: value_type of OutputIterator -> Point_3.
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("read_ply_points()");
return read_ply_points<typename value_type_traits<OutputIterator>::type>
(stream, output,
CGAL::parameters::point_map (point_map));
}
#endif // CGAL_NO_DEPRECATED_CODE
/// \endcond

23
Point_set_processing_3/include/CGAL/IO/read_xyz_points.h
View File

@ -218,6 +218,7 @@ read_xyz_points(
(stream, output, CGAL::parameters::all_default());
}
#ifndef CGAL_NO_DEPRECATED_CODE
// deprecated API
template <typename OutputIteratorValueType,
typename OutputIterator,
@ -225,6 +226,7 @@ template <typename OutputIteratorValueType,
typename NormalPMap,
typename Kernel
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::read_xyz_points_and_normals(), please update your code")
bool
read_xyz_points_and_normals(
std::istream& stream, ///< input stream.
@ -233,7 +235,6 @@ read_xyz_points_and_normals(
NormalPMap normal_map, ///< property map: value_type of OutputIterator -> Vector_3.
const Kernel& /*kernel*/) ///< geometric traits.
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("read_xyz_points_and_normals()");
return read_xyz_points<OutputIteratorValueType>
(stream, output,
CGAL::parameters::point_map (point_map).
@ -247,6 +248,7 @@ template <typename OutputIterator,
typename NormalPMap,
typename Kernel
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::read_xyz_points_and_normals(), please update your code")
bool
read_xyz_points_and_normals(
std::istream& stream, ///< input stream.
@ -255,7 +257,6 @@ read_xyz_points_and_normals(
NormalPMap normal_map, ///< property map: value_type of OutputIterator -> Vector_3.
const Kernel& kernel) ///< geometric traits.
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("read_xyz_points_and_normals()");
return read_xyz_points<typename value_type_traits<OutputIterator>::type>
(stream, output,
CGAL::parameters::point_map (point_map).
@ -269,6 +270,7 @@ template <typename OutputIteratorValueType,
typename PointPMap,
typename NormalPMap
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::read_xyz_points_and_normals(), please update your code")
bool
read_xyz_points_and_normals(
std::istream& stream, ///< input stream.
@ -276,7 +278,6 @@ read_xyz_points_and_normals(
PointPMap point_map, ///< property map: value_type of OutputIterator -> Point_3.
NormalPMap normal_map) ///< property map: value_type of OutputIterator -> Vector_3.
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("read_xyz_points_and_normals()");
return read_xyz_points<OutputIteratorValueType>
(stream, output,
CGAL::parameters::point_map (point_map).
@ -288,6 +289,7 @@ template <typename OutputIterator,
typename PointPMap,
typename NormalPMap
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::read_xyz_points_and_normals(), please update your code")
bool
read_xyz_points_and_normals(
std::istream& stream, ///< input stream.
@ -295,7 +297,6 @@ read_xyz_points_and_normals(
PointPMap point_map, ///< property map: value_type of OutputIterator -> Point_3.
NormalPMap normal_map) ///< property map: value_type of OutputIterator -> Vector_3.
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("read_xyz_points_and_normals()");
return read_xyz_points<typename value_type_traits<OutputIterator>::type>
(stream, output,
CGAL::parameters::point_map (point_map).
@ -307,13 +308,13 @@ template <typename OutputIteratorValueType,
typename OutputIterator,
typename NormalPMap
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::read_xyz_points_and_normals(), please update your code")
bool
read_xyz_points_and_normals(
std::istream& stream, ///< input stream.
OutputIterator output, ///< output iterator over points.
NormalPMap normal_map) ///< property map: value_type of OutputIterator -> Vector_3.
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("read_xyz_points_and_normals()");
return read_xyz_points<OutputIteratorValueType>
(stream, output,
CGAL::parameters::normal_map (normal_map));
@ -323,13 +324,13 @@ read_xyz_points_and_normals(
template <typename OutputIterator,
typename NormalPMap
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::read_xyz_points_and_normals(), please update your code")
bool
read_xyz_points_and_normals(
std::istream& stream, ///< input stream.
OutputIterator output, ///< output iterator over points.
NormalPMap normal_map) ///< property map: value_type of OutputIterator -> Vector_3.
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("read_xyz_points_and_normals()");
return read_xyz_points<typename value_type_traits<OutputIterator>::type>
(stream, output,
CGAL::parameters::normal_map (normal_map));
@ -341,6 +342,7 @@ template <typename OutputIteratorValueType,
typename PointPMap,
typename Kernel
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::read_xyz_points(), please update your code")
bool
read_xyz_points(
std::istream& stream, ///< input stream.
@ -348,7 +350,6 @@ read_xyz_points(
PointPMap point_map, ///< property map: value_type of OutputIterator -> Point_3.
const Kernel& kernel) ///< geometric traits.
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("read_xyz_points()");
return read_xyz_points<OutputIteratorValueType>
(stream, output,
CGAL::parameters::point_map (point_map).
@ -360,6 +361,7 @@ template <typename OutputIterator,
typename PointPMap,
typename Kernel
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::read_xyz_points(), please update your code")
bool
read_xyz_points(
std::istream& stream, ///< input stream.
@ -367,7 +369,6 @@ read_xyz_points(
PointPMap point_map, ///< property map: value_type of OutputIterator -> Point_3.
const Kernel& kernel) ///< geometric traits.
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("read_xyz_points()");
return read_xyz_points<typename value_type_traits<OutputIterator>::type>
(stream, output,
CGAL::parameters::point_map (point_map).
@ -379,13 +380,13 @@ template <typename OutputIteratorValueType,
typename OutputIterator,
typename PointPMap
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::read_xyz_points(), please update your code")
bool
read_xyz_points(
std::istream& stream, ///< input stream.
OutputIterator output, ///< output iterator over points.
PointPMap point_map) ///< property map: value_type of OutputIterator -> Point_3.
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("read_xyz_points()");
return read_xyz_points<OutputIteratorValueType>
(stream, output,
CGAL::parameters::point_map (point_map));
@ -395,18 +396,18 @@ read_xyz_points(
template <typename OutputIterator,
typename PointPMap
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::read_xyz_points(), please update your code")
bool
read_xyz_points(
std::istream& stream, ///< input stream.
OutputIterator output, ///< output iterator over points.
PointPMap point_map) ///< property map: value_type of OutputIterator -> Point_3.
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("read_xyz_points()");
return read_xyz_points<typename value_type_traits<OutputIterator>::type>
(stream, output,
CGAL::parameters::point_map (point_map));
}
#endif // CGAL_NO_DEPRECATED_CODE
/// \endcond

8
Point_set_processing_3/include/CGAL/IO/write_las_points.h
View File

@ -199,7 +199,7 @@ template <typename PointRange,
typename PointMap,
typename ... PropertyHandler>
bool write_las_points_with_properties (std::ostream& stream, ///< output stream.
const PoinRange& points, ///< input point range.
const PointRange& points, ///< input point range.
std::tuple<PointMap,
LAS_property::X,
LAS_property::Y,
@ -305,9 +305,11 @@ write_las_points(
(stream, points, CGAL::Point_set_processing_3::parameters::all_default(points));
}
#ifndef CGAL_NO_DEPRECATED_CODE
// deprecated API
template < typename ForwardIterator,
typename PointMap >
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::write_las_points(), please update your code")
bool
write_las_points(
std::ostream& stream, ///< output stream.
@ -315,7 +317,6 @@ write_las_points(
ForwardIterator beyond, ///< past-the-end input point.
PointMap point_map) ///< property map: value_type of OutputIterator -> Point_3.
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("write_las_points()");
CGAL::Iterator_range<ForwardIterator> points (first, beyond);
return write_las_points
(stream, points,
@ -324,17 +325,18 @@ write_las_points(
// deprecated API
template < typename ForwardIterator >
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::write_las_points(), please update your code")
bool
write_las_points(
std::ostream& stream, ///< output stream.
ForwardIterator first, ///< first input point.
ForwardIterator beyond) ///< past-the-end input point.
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("write_las_points()");
CGAL::Iterator_range<ForwardIterator> points (first, beyond);
return write_las_points
(stream, points);
}
#endif // CGAL_NO_DEPRECATED_CODE
/// \endcond

14
Point_set_processing_3/include/CGAL/IO/write_off_points.h
View File

@ -114,12 +114,14 @@ write_off_points(
(stream, points, CGAL::Point_set_processing_3::parameters::all_default(points));
}
#ifndef CGAL_NO_DEPRECATED_CODE
// deprecated API
template <typename ForwardIterator,
typename PointMap,
typename NormalMap,
typename Kernel
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::write_off_points_and_normals(), please update your code")
bool
write_off_points_and_normals(
std::ostream& stream, ///< output stream.
@ -129,7 +131,6 @@ write_off_points_and_normals(
NormalMap normal_map, ///< property map: value_type of ForwardIterator -> Vector_3.
const Kernel& /*kernel*/) ///< geometric traits.
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("write_off_points_and_normals()");
CGAL::Iterator_range<ForwardIterator> points (first, beyond);
return write_off_points
(stream, points,
@ -143,6 +144,7 @@ template <typename ForwardIterator,
typename PointMap,
typename NormalMap
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::write_off_points_and_normals(), please update your code")
bool
write_off_points_and_normals(
std::ostream& stream, ///< output stream.
@ -151,7 +153,6 @@ write_off_points_and_normals(
PointMap point_map, ///< property map: value_type of OutputIterator -> Point_3.
NormalMap normal_map) ///< property map: value_type of OutputIterator -> Vector_3.
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("write_off_points_and_normals()");
CGAL::Iterator_range<ForwardIterator> points (first, beyond);
return write_off_points
(stream, points,
@ -163,6 +164,7 @@ write_off_points_and_normals(
template <typename ForwardIterator,
typename NormalMap
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::write_off_points_and_normals(), please update your code")
bool
write_off_points_and_normals(
std::ostream& stream, ///< output stream.
@ -170,7 +172,6 @@ write_off_points_and_normals(
ForwardIterator beyond, ///< past-the-end input point.
NormalMap normal_map) ///< property map: value_type of OutputIterator -> Vector_3.
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("write_off_points_and_normals()");
CGAL::Iterator_range<ForwardIterator> points (first, beyond);
return write_off_points
(stream, points,
@ -182,6 +183,7 @@ template <typename ForwardIterator,
typename PointMap,
typename Kernel
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::write_off_points(), please update your code")
bool
write_off_points(
std::ostream& stream, ///< output stream.
@ -190,7 +192,6 @@ write_off_points(
PointMap point_map, ///< property map: value_type of ForwardIterator -> Point_3.
const Kernel& ) ///< geometric traits.
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("write_off_points()");
CGAL::Iterator_range<ForwardIterator> points (first, beyond);
return write_off_points
(stream, points,
@ -202,6 +203,7 @@ write_off_points(
template <typename ForwardIterator,
typename PointMap
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::write_off_points(), please update your code")
bool
write_off_points(
std::ostream& stream, ///< output stream.
@ -209,7 +211,6 @@ write_off_points(
ForwardIterator beyond, ///< past-the-end input point.
PointMap point_map) ///< property map: value_type of OutputIterator -> Point_3.
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("write_off_points()");
CGAL::Iterator_range<ForwardIterator> points (first, beyond);
return write_off_points
(stream, points,
@ -219,17 +220,18 @@ write_off_points(
// deprecated API
template <typename ForwardIterator
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::write_off_points(), please update your code")
bool
write_off_points(
std::ostream& stream, ///< output stream.
ForwardIterator first, ///< first input point.
ForwardIterator beyond) ///< past-the-end input point.
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("write_off_points()");
CGAL::Iterator_range<ForwardIterator> points (first, beyond);
return write_off_points
(stream, points);
}
#endif // CGAL_NO_DEPRECATED_CODE
/// \endcond

12
Point_set_processing_3/include/CGAL/IO/write_ply_points.h
View File

@ -430,11 +430,13 @@ write_ply_points(
return write_ply_points
(stream, points, CGAL::Point_set_processing_3::parameters::all_default(points));
}
#ifndef CGAL_NO_DEPRECATED_CODE
// deprecated API
template < typename ForwardIterator,
typename PointMap,
typename VectorMap >
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::write_ply_points_and_normals(), please update your code")
bool
write_ply_points_and_normals(
std::ostream& stream, ///< output stream.
@ -443,7 +445,6 @@ write_ply_points_and_normals(
PointMap point_map, ///< property map: value_type of OutputIterator -> Point_3.
VectorMap normal_map) ///< property map: value_type of OutputIterator -> Vector_3.
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("write_ply_points_and_normals()");
CGAL::Iterator_range<ForwardIterator> points (first, beyond);
return write_ply_points
(stream, points,
@ -455,6 +456,7 @@ write_ply_points_and_normals(
template <typename ForwardIterator,
typename VectorMap
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::write_ply_points_and_normals(), please update your code")
bool
write_ply_points_and_normals(
std::ostream& stream, ///< output stream.
@ -462,7 +464,6 @@ write_ply_points_and_normals(
ForwardIterator beyond, ///< past-the-end input point.
VectorMap normal_map) ///< property map: value_type of OutputIterator -> Vector_3.
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("write_ply_points_and_normals()");
CGAL::Iterator_range<ForwardIterator> points (first, beyond);
return write_ply_points
(stream, points,
@ -472,6 +473,7 @@ write_ply_points_and_normals(
// deprecated API
template < typename ForwardIterator,
typename PointMap >
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::write_ply_points(), please update your code")
bool
write_ply_points(
std::ostream& stream, ///< output stream.
@ -479,7 +481,6 @@ write_ply_points(
ForwardIterator beyond, ///< past-the-end input point.
PointMap point_map) ///< property map: value_type of OutputIterator -> Point_3.
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("write_ply_points()");
CGAL::Iterator_range<ForwardIterator> points (first, beyond);
return write_ply_points
(stream, points,
@ -488,17 +489,18 @@ write_ply_points(
// deprecated API
template < typename ForwardIterator >
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::write_ply_points(), please update your code")
bool
write_ply_points(
std::ostream& stream, ///< output stream.
ForwardIterator first, ///< first input point.
ForwardIterator beyond) ///< past-the-end input point.
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("write_ply_points()");
CGAL::Iterator_range<ForwardIterator> points (first, beyond);
return write_ply_points
(stream, points);
}
#endif // CGAL_NO_DEPRECATED_CODE
/// \endcond

14
Point_set_processing_3/include/CGAL/IO/write_xyz_points.h
View File

@ -115,12 +115,14 @@ write_xyz_points(
(stream, points, CGAL::Point_set_processing_3::parameters::all_default(points));
}
#ifndef CGAL_NO_DEPRECATED_CODE
// deprecated API
template <typename ForwardIterator,
typename PointMap,
typename NormalMap,
typename Kernel
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::write_xyz_points_and_normals(), please update your code")
bool
write_xyz_points_and_normals(
std::ostream& stream, ///< output stream.
@ -130,7 +132,6 @@ write_xyz_points_and_normals(
NormalMap normal_map, ///< property map: value_type of ForwardIterator -> Vector_3.
const Kernel& /*kernel*/) ///< geometric traits.
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("write_xyz_points_and_normals()");
CGAL::Iterator_range<ForwardIterator> points (first, beyond);
return write_xyz_points
(stream, points,
@ -144,6 +145,7 @@ template <typename ForwardIterator,
typename PointMap,
typename NormalMap
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::write_xyz_points_and_normals(), please update your code")
bool
write_xyz_points_and_normals(
std::ostream& stream, ///< output stream.
@ -152,7 +154,6 @@ write_xyz_points_and_normals(
PointMap point_map, ///< property map: value_type of OutputIterator -> Point_3.
NormalMap normal_map) ///< property map: value_type of OutputIterator -> Vector_3.
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("write_xyz_points_and_normals()");
CGAL::Iterator_range<ForwardIterator> points (first, beyond);
return write_xyz_points
(stream, points,
@ -164,6 +165,7 @@ write_xyz_points_and_normals(
template <typename ForwardIterator,
typename NormalMap
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::write_xyz_points_and_normals(), please update your code")
bool
write_xyz_points_and_normals(
std::ostream& stream, ///< output stream.
@ -171,7 +173,6 @@ write_xyz_points_and_normals(
ForwardIterator beyond, ///< past-the-end input point.
NormalMap normal_map) ///< property map: value_type of ForwardIterator -> Vector_3.
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("write_xyz_points_and_normals()");
CGAL::Iterator_range<ForwardIterator> points (first, beyond);
return write_xyz_points
(stream, points,
@ -183,6 +184,7 @@ template <typename ForwardIterator,
typename PointMap,
typename Kernel
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::write_xyz_points(), please update your code")
bool
write_xyz_points(
std::ostream& stream, ///< output stream.
@ -191,7 +193,6 @@ write_xyz_points(
PointMap point_map, ///< property map: value_type of OutputIterator -> Point_3.
const Kernel& kernel)
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("write_xyz_points()");
CGAL::Iterator_range<ForwardIterator> points (first, beyond);
return write_xyz_points
(stream, points,
@ -202,6 +203,7 @@ write_xyz_points(
template <typename ForwardIterator,
typename PointMap
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::write_xyz_points(), please update your code")
bool
write_xyz_points(
std::ostream& stream, ///< output stream.
@ -209,7 +211,6 @@ write_xyz_points(
ForwardIterator beyond, ///< past-the-end input point.
PointMap point_map) ///< property map: value_type of OutputIterator -> Point_3.
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("write_xyz_points()");
CGAL::Iterator_range<ForwardIterator> points (first, beyond);
return write_xyz_points
(stream, points,
@ -219,17 +220,18 @@ write_xyz_points(
// deprecated API
template <typename ForwardIterator
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::write_xyz_points(), please update your code")
bool
write_xyz_points(
std::ostream& stream, ///< output stream.
ForwardIterator first, ///< first input point.
ForwardIterator beyond) ///< past-the-end input point.
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("write_xyz_points()");
CGAL::Iterator_range<ForwardIterator> points (first, beyond);
return write_xyz_points
(stream, points);
}
#endif // CGAL_NO_DEPRECATED_CODE
/// \endcond

8
Point_set_processing_3/include/CGAL/bilateral_smooth_point_set.h
View File

@ -604,12 +604,14 @@ bilateral_smooth_point_set(
(points, k, CGAL::Point_set_processing_3::parameters::all_default(points));
}
#ifndef CGAL_NO_DEPRECATED_CODE
// deprecated API
template <typename ConcurrencyTag,
typename ForwardIterator,
typename PointMap,
typename NormalMap,
typename Kernel>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::bilateral_smooth_point_set(), please update your code")
double
bilateral_smooth_point_set(
ForwardIterator first, ///< forward iterator on the first input point.
@ -623,7 +625,6 @@ bilateral_smooth_point_set(
///< The range of possible value is [0, 90].
const Kernel& /*kernel*/) ///< geometric traits.
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("bilateral_smooth_point_set()");
CGAL::Iterator_range<ForwardIterator> points = CGAL::make_range (first, beyond);
return bilateral_smooth_point_set<ConcurrencyTag>
(points,
@ -637,6 +638,7 @@ template <typename ConcurrencyTag,
typename ForwardIterator,
typename PointMap,
typename NormalMap>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::bilateral_smooth_point_set(), please update your code")
double
bilateral_smooth_point_set(
ForwardIterator first, ///< forward iterator to the first input point.
@ -647,7 +649,6 @@ bilateral_smooth_point_set(
double sharpness_angle ///< control sharpness(0-90)
) ///< property map OutputIterator -> Vector_3.
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("bilateral_smooth_point_set()");
CGAL::Iterator_range<ForwardIterator> points = CGAL::make_range (first, beyond);
return bilateral_smooth_point_set<ConcurrencyTag>
(points,
@ -659,6 +660,7 @@ bilateral_smooth_point_set(
template <typename ConcurrencyTag,
typename ForwardIterator,
typename NormalMap>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::bilateral_smooth_point_set(), please update your code")
double
bilateral_smooth_point_set(
ForwardIterator first, ///< forward iterator to the first input point.
@ -667,13 +669,13 @@ bilateral_smooth_point_set(
double sharpness_angle, ///< control sharpness(0-90)
NormalMap normal_map) ///< property map OutputIterator -> Vector_3.
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("bilateral_smooth_point_set()");
CGAL::Iterator_range<ForwardIterator> points = CGAL::make_range (first, beyond);
return bilateral_smooth_point_set<ConcurrencyTag>
(points,
k,
CGAL::parameters::normal_map(normal_map).sharpness_angle(sharpness_angle));
}
#endif // CGAL_NO_DEPRECATED_CODE
/// \endcond

8
Point_set_processing_3/include/CGAL/compute_average_spacing.h
View File

@ -243,12 +243,14 @@ double compute_average_spacing(
}
#ifndef CGAL_NO_DEPRECATED_CODE
// deprecated API
template <typename ConcurrencyTag,
typename InputIterator,
typename PointMap,
typename Kernel
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::compute_average_spacing(), please update your code")
typename Kernel::FT
compute_average_spacing(
InputIterator first, ///< iterator over the first input point.
@ -257,7 +259,6 @@ compute_average_spacing(
unsigned int k, ///< number of neighbors.
const Kernel& /*kernel*/) ///< geometric traits.
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("compute_average_spacing()");
return compute_average_spacing<ConcurrencyTag>(
CGAL::make_range (first,beyond),
k,
@ -271,6 +272,7 @@ template <typename ConcurrencyTag,
typename InputIterator,
typename PointMap
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::compute_average_spacing(), please update your code")
typename Kernel_traits<typename boost::property_traits<PointMap>::value_type>::Kernel::FT
compute_average_spacing(
InputIterator first, ///< iterator over the first input point.
@ -278,7 +280,6 @@ compute_average_spacing(
PointMap point_map, ///< property map: value_type of InputIterator -> Point_3
unsigned int k) ///< number of neighbors
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("compute_average_spacing()");
return compute_average_spacing<ConcurrencyTag>(
CGAL::make_range (first,beyond),
k,
@ -288,15 +289,16 @@ compute_average_spacing(
// deprecated API
template < typename ConcurrencyTag, typename InputIterator >
typename Kernel_traits<typename std::iterator_traits<InputIterator>::value_type>::Kernel::FT
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::compute_average_spacing(), please update your code")
compute_average_spacing(
InputIterator first, ///< iterator over the first input point.
InputIterator beyond, ///< past-the-end iterator over the input points.
unsigned int k) ///< number of neighbors.
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("compute_average_spacing()");
return compute_average_spacing<ConcurrencyTag>(
CGAL::make_range (first,beyond), k);
}
#endif // CGAL_NO_DEPRECATED_CODE
/// \endcond

29
Point_set_processing_3/include/CGAL/edge_aware_upsample_point_set.h
View File

@ -341,12 +341,18 @@ edge_aware_upsample_point_set(
PointMap point_map = choose_param(get_param(np, internal_np::point_map), PointMap());
NormalMap normal_map = choose_param(get_param(np, internal_np::normal_map), NormalMap());
double sharpness_angle = choose_param(get_param(np, internal_np::sharpness_angle), 30.);
double edge_sensitivity = choose_param(get_param(np, internal_np::sharpness_angle), 1);
double neighbor_radius = choose_param(get_param(np, internal_np::sharpness_angle), -1);
double edge_sensitivity = choose_param(get_param(np, internal_np::edge_sensitivity), 1);
double neighbor_radius = choose_param(get_param(np, internal_np::neighbor_radius), -1);
std::size_t number_of_output_points = choose_param(get_param(np, internal_np::number_of_output_points), 1000);
std::cerr << sharpness_angle << " " << edge_sensitivity << " " << neighbor_radius
<< " " << number_of_output_points << std::endl;
// trick in case the output iterator add points to the input container
typename PointRange::iterator begin = points.begin();
typename PointRange::iterator end = points.end();
// preconditions
CGAL_point_set_processing_precondition(points.begin() != points.end());
CGAL_point_set_processing_precondition(begin != end);
CGAL_point_set_processing_precondition(sharpness_angle >= 0
&&sharpness_angle <= 90);
CGAL_point_set_processing_precondition(edge_sensitivity >= 0
@ -355,7 +361,7 @@ edge_aware_upsample_point_set(
edge_sensitivity *= 10; // just project [0, 1] to [0, 10].
std::size_t number_of_input = std::distance(points.begin(), points.end());
std::size_t number_of_input = std::distance(begin, end);
CGAL_point_set_processing_precondition(number_of_output_points > number_of_input);
@ -377,8 +383,8 @@ edge_aware_upsample_point_set(
std::vector<Rich_point> rich_point_set(number_of_input);
CGAL::Bbox_3 bbox(0., 0., 0., 0., 0., 0.);
typename PointRange::const_iterator it = points.begin(); // point iterator
for(unsigned int i = 0; it != points.end(); ++it, ++i)
typename PointRange::const_iterator it = begin; // point iterator
for(unsigned int i = 0; it != end; ++it, ++i)
{
rich_point_set[i].pt = get(point_map, *it);
rich_point_set[i].normal = get(normal_map, *it);
@ -428,7 +434,7 @@ edge_aware_upsample_point_set(
if (iter_time == 0)
{
//estimate density threshold for the points.begin() time
//estimate density threshold for the first time
for (unsigned int i = 0; i < rich_point_set.size() * 0.05; ++i)
{
const Rich_point& v = rich_point_set[i];
@ -588,6 +594,8 @@ edge_aware_upsample_point_set(
(points, output, CGAL::Point_set_processing_3::parameters::all_default(points));
}
#ifndef CGAL_NO_DEPRECATED_CODE
// deprecated API
template <typename ConcurrencyTag,
typename OutputIterator,
@ -595,6 +603,7 @@ template <typename ConcurrencyTag,
typename PointMap,
typename NormalMap,
typename Kernel>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::edge_aware_upsample_point_set(), please update your code")
OutputIterator
edge_aware_upsample_point_set(
ForwardIterator first, ///< forward iterator on the first input point.
@ -626,7 +635,6 @@ edge_aware_upsample_point_set(
const Kernel& /*kernel*/ ///< geometric traits.
)
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("edge_aware_upsample_point_set()");
return edge_aware_upsample_point_set<ConcurrencyTag>
(CGAL::make_range (first, beyond), output,
CGAL::parameters::point_map (point_map).
@ -645,6 +653,7 @@ template <typename ConcurrencyTag,
typename ForwardIterator,
typename PointMap,
typename NormalMap>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::edge_aware_upsample_point_set(), please update your code")
OutputIterator
edge_aware_upsample_point_set(
ForwardIterator first, ///< forward iterator to the first input point.
@ -658,7 +667,6 @@ edge_aware_upsample_point_set(
const std::size_t number_of_output_points///< number of iterations.
)
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("edge_aware_upsample_point_set()");
return edge_aware_upsample_point_set<ConcurrencyTag>
(CGAL::make_range (first, beyond), output,
CGAL::parameters::point_map (point_map).
@ -674,6 +682,7 @@ template <typename ConcurrencyTag,
typename OutputIterator,
typename ForwardIterator,
typename NormalMap>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::edge_aware_upsample_point_set(), please update your code")
OutputIterator
edge_aware_upsample_point_set(
ForwardIterator first, ///< iterator over the first input point
@ -686,7 +695,6 @@ edge_aware_upsample_point_set(
const std::size_t number_of_output_points = 1000///< number of output points.
)
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("edge_aware_upsample_point_set()");
return edge_aware_upsample_point_set<ConcurrencyTag>
(CGAL::make_range (first, beyond), output,
CGAL::parameters::normal_map (normal_map).
@ -695,6 +703,7 @@ edge_aware_upsample_point_set(
neighbor_radius (neighbor_radius).
number_of_output_points (number_of_output_points));
}
#endif // CGAL_NO_DEPRECATED_CODE
/// \endcond
} //namespace CGAL

26
Point_set_processing_3/include/CGAL/estimate_scale.h
View File

@ -725,6 +725,7 @@ estimate_global_range_scale(const PointRange& points)
(points, CGAL::Point_set_processing_3::parameters::all_default(points));
}
#ifndef CGAL_NO_DEPRECATED_CODE
// deprecated API
template <typename SamplesInputIterator,
typename SamplesPointMap,
@ -733,6 +734,7 @@ template <typename SamplesInputIterator,
typename OutputIterator,
typename Kernel
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::estimate_local_k_neighbor_scales(), please update your code")
OutputIterator
estimate_local_k_neighbor_scales(
SamplesInputIterator first, ///< iterator over the first input sample.
@ -744,7 +746,6 @@ estimate_local_k_neighbor_scales(
OutputIterator output, ///< output iterator to store the computed scales
const Kernel& /*kernel*/) ///< geometric traits.
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("estimate_local_k_neighbor_scales()");
return estimate_local_k_neighbor_scales
(CGAL::make_range (first, beyond),
CGAL::make_range (first_query, beyond_query),
@ -761,6 +762,7 @@ template <typename SamplesInputIterator,
typename QueriesPointMap,
typename OutputIterator
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::estimate_local_k_neighbor_scales(), please update your code")
OutputIterator
estimate_local_k_neighbor_scales(
SamplesInputIterator first, ///< iterator over the first input sample.
@ -771,7 +773,6 @@ estimate_local_k_neighbor_scales(
QueriesPointMap queries_map, ///< property map: value_type of InputIterator -> Point_3 or Point_2
OutputIterator output) ///< output iterator to store the computed scales
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("estimate_local_k_neighbor_scales()");
return estimate_local_k_neighbor_scales
(CGAL::make_range (first, beyond),
CGAL::make_range (first_query, beyond_query),
@ -785,6 +786,7 @@ template <typename SamplesInputIterator,
typename QueriesInputIterator,
typename OutputIterator
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::estimate_local_k_neighbor_scales(), please update your code")
OutputIterator
estimate_local_k_neighbor_scales(
SamplesInputIterator first, ///< iterator over the first input sample.
@ -793,7 +795,6 @@ estimate_local_k_neighbor_scales(
QueriesInputIterator beyond_query, ///< past-the-end iterator over the points where scale must be estimated
OutputIterator output) ///< output iterator to store the computed scales
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("estimate_local_k_neighbor_scales()");
return estimate_local_k_neighbor_scales
(CGAL::make_range (first, beyond),
CGAL::make_range (first_query, beyond_query),
@ -805,6 +806,7 @@ template <typename InputIterator,
typename PointMap,
typename Kernel
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::estimate_global_k_neighbor_scale(), please update your code")
std::size_t
estimate_global_k_neighbor_scale(
InputIterator first, ///< iterator over the first input point.
@ -812,7 +814,6 @@ estimate_global_k_neighbor_scale(
PointMap point_map, ///< property map: value_type of InputIterator -> Point_3 or Point_2
const Kernel& kernel) ///< geometric traits.
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("estimate_global_k_neighbor_scale()");
return estimate_global_k_neighbor_scale
(CGAL::make_range (first, beyond),
CGAL::parameters::point_map (point_map).
@ -823,13 +824,13 @@ estimate_global_k_neighbor_scale(
template <typename InputIterator,
typename PointMap
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::estimate_global_k_neighbor_scale(), please update your code")
std::size_t
estimate_global_k_neighbor_scale(
InputIterator first, ///< iterator over the first input point.
InputIterator beyond, ///< past-the-end iterator over the input points.
PointMap point_map) ///< property map: value_type of InputIterator -> Point_3 or Point_2
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("estimate_global_k_neighbor_scale()");
return estimate_global_k_neighbor_scale
(CGAL::make_range (first, beyond),
CGAL::parameters::point_map (point_map));
@ -838,12 +839,12 @@ estimate_global_k_neighbor_scale(
// deprecated API
template <typename InputIterator
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::estimate_global_k_neighbor_scale(), please update your code")
std::size_t
estimate_global_k_neighbor_scale(
InputIterator first, ///< iterator over the first input point.
InputIterator beyond) ///< past-the-end iterator over the input points.
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("estimate_global_k_neighbor_scale()");
return estimate_global_k_neighbor_scale
(CGAL::make_range (first, beyond));
}
@ -856,6 +857,7 @@ template <typename SamplesInputIterator,
typename OutputIterator,
typename Kernel
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::estimate_local_range_scales(), please update your code")
OutputIterator
estimate_local_range_scales(
SamplesInputIterator first, ///< iterator over the first input sample.
@ -867,7 +869,6 @@ estimate_local_range_scales(
OutputIterator output, ///< output iterator to store the computed scales
const Kernel& /*kernel*/) ///< geometric traits.
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("estimate_local_range_scales()");
return estimate_local_range_scales
(CGAL::make_range (first, beyond),
CGAL::make_range (first_query, beyond_query),
@ -884,6 +885,7 @@ template <typename SamplesInputIterator,
typename QueriesPointMap,
typename OutputIterator
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::estimate_local_range_scales(), please update your code")
OutputIterator
estimate_local_range_scales(
SamplesInputIterator first, ///< iterator over the first input sample.
@ -894,7 +896,6 @@ estimate_local_range_scales(
QueriesPointMap queries_map, ///< property map: value_type of InputIterator -> Point_3 or Point_2
OutputIterator output) ///< output iterator to store the computed scales
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("estimate_local_range_scales()");
return estimate_local_range_scales
(CGAL::make_range (first, beyond),
CGAL::make_range (first_query, beyond_query),
@ -908,6 +909,7 @@ template <typename SamplesInputIterator,
typename QueriesInputIterator,
typename OutputIterator
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::estimate_local_range_scales(), please update your code")
OutputIterator
estimate_local_range_scales(
SamplesInputIterator first, ///< iterator over the first input sample.
@ -916,7 +918,6 @@ estimate_local_range_scales(
QueriesInputIterator beyond_query, ///< past-the-end iterator over the points where scale must be estimated
OutputIterator output) ///< output iterator to store the computed scales
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("estimate_local_range_scales()");
return estimate_local_range_scales
(CGAL::make_range (first, beyond),
CGAL::make_range (first_query, beyond_query),
@ -929,6 +930,7 @@ template <typename InputIterator,
typename PointMap,
typename Kernel
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::estimate_global_range_scale(), please update your code")
double
estimate_global_range_scale(
InputIterator first, ///< iterator over the first input point.
@ -936,7 +938,6 @@ estimate_global_range_scale(
PointMap point_map, ///< property map: value_type of InputIterator -> Point_3 or Point_3
const Kernel& kernel) ///< geometric traits.
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("estimate_global_range_scale()");
return estimate_global_range_scale
(CGAL::make_range (first, beyond),
CGAL::parameters::point_map (point_map).
@ -947,13 +948,13 @@ estimate_global_range_scale(
template <typename InputIterator,
typename PointMap
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::estimate_global_range_scale(), please update your code")
double
estimate_global_range_scale(
InputIterator first, ///< iterator over the first input point.
InputIterator beyond, ///< past-the-end iterator over the input points.
PointMap point_map) ///< property map: value_type of InputIterator -> Point_3 or Point_3
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("estimate_global_range_scale()");
return estimate_global_range_scale
(CGAL::make_range (first, beyond),
CGAL::parameters::point_map (point_map));
@ -962,15 +963,16 @@ estimate_global_range_scale(
// deprecated API
template <typename InputIterator>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::estimate_global_range_scale(), please update your code")
double
estimate_global_range_scale(
InputIterator first, ///< iterator over the first input point.
InputIterator beyond) ///< past-the-end iterator over the input points.
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("estimate_global_range_scale()");
return estimate_global_range_scale
(CGAL::make_range (first, beyond));
}
#endif // CGAL_NO_DEPRECATED_CODE
/// \endcond
} //namespace CGAL

9
Point_set_processing_3/include/CGAL/grid_simplify_point_set.h
View File

@ -239,10 +239,13 @@ grid_simplify_point_set(PointRange& points, double epsilon)
(points, epsilon, CGAL::Point_set_processing_3::parameters::all_default(points));
}
#ifndef CGAL_NO_DEPRECATED_CODE
// deprecated API
template <typename ForwardIterator,
typename PointMap,
typename Kernel>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::grid_simplify_point_set(), please update your code")
ForwardIterator grid_simplify_point_set(
ForwardIterator first, ///< iterator over the first input point.
ForwardIterator beyond, ///< past-the-end iterator over the input points.
@ -250,7 +253,6 @@ ForwardIterator grid_simplify_point_set(
double epsilon, ///< tolerance value when merging 3D points.
const Kernel& /*kernel*/) ///< geometric traits.
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("grid_simplify_point_set()");
CGAL::Iterator_range<ForwardIterator> points = CGAL::make_range (first, beyond);
return grid_simplify_point_set
(points,
@ -264,6 +266,7 @@ ForwardIterator grid_simplify_point_set(
template <typename ForwardIterator,
typename PointMap
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::grid_simplify_point_set(), please update your code")
ForwardIterator
grid_simplify_point_set(
ForwardIterator first, ///< iterator over the first input point
@ -271,7 +274,6 @@ grid_simplify_point_set(
PointMap point_map, ///< property map: value_type of ForwardIterator -> Point_3
double epsilon) ///< tolerance value when merging 3D points
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("grid_simplify_point_set()");
CGAL::Iterator_range<ForwardIterator> points = CGAL::make_range (first, beyond);
return grid_simplify_point_set
(points,
@ -282,18 +284,19 @@ grid_simplify_point_set(
// deprecated API
template <typename ForwardIterator
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::grid_simplify_point_set(), please update your code")
ForwardIterator
grid_simplify_point_set(
ForwardIterator first, ///< iterator over the first input point
ForwardIterator beyond, ///< past-the-end iterator
double epsilon) ///< tolerance value when merging 3D points
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("grid_simplify_point_set()");
CGAL::Iterator_range<ForwardIterator> points = CGAL::make_range (first, beyond);
return grid_simplify_point_set
(points,
epsilon);
}
#endif // CGAL_NO_DEPRECATED_CODE
/// \endcond

12
Point_set_processing_3/include/CGAL/hierarchy_simplify_point_set.h
View File

@ -337,12 +337,14 @@ namespace CGAL {
return hierarchy_simplify_point_set
(points, CGAL::Point_set_processing_3::parameters::all_default(points));
}
#ifndef CGAL_NO_DEPRECATED_CODE
// deprecated API
template <typename ForwardIterator,
typename PointMap,
typename DiagonalizeTraits,
typename Kernel>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::hierarchy_simplify_point_set(), please update your code")
ForwardIterator hierarchy_simplify_point_set (ForwardIterator begin,
ForwardIterator end,
PointMap point_map,
@ -351,7 +353,6 @@ namespace CGAL {
const DiagonalizeTraits&,
const Kernel&)
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("hierarchy_simplify_point_set()");
CGAL::Iterator_range<ForwardIterator> points (begin, end);
return hierarchy_simplify_point_set
(points,
@ -366,6 +367,7 @@ namespace CGAL {
template <typename ForwardIterator,
typename PointMap,
typename DiagonalizeTraits>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::hierarchy_simplify_point_set(), please update your code")
ForwardIterator hierarchy_simplify_point_set (ForwardIterator begin,
ForwardIterator end,
PointMap point_map,
@ -373,7 +375,6 @@ namespace CGAL {
const double var_max,
const DiagonalizeTraits& diagonalize_traits)
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("hierarchy_simplify_point_set()");
CGAL::Iterator_range<ForwardIterator> points (begin, end);
return hierarchy_simplify_point_set
(points,
@ -386,13 +387,13 @@ namespace CGAL {
// deprecated API
template <typename ForwardIterator,
typename PointMap >
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::hierarchy_simplify_point_set(), please update your code")
ForwardIterator hierarchy_simplify_point_set (ForwardIterator begin,
ForwardIterator end,
PointMap point_map,
const unsigned int size,
const double var_max)
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("hierarchy_simplify_point_set()");
CGAL::Iterator_range<ForwardIterator> points (begin, end);
return hierarchy_simplify_point_set
(points,
@ -403,18 +404,19 @@ namespace CGAL {
// deprecated API
template <typename ForwardIterator >
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::hierarchy_simplify_point_set(), please update your code")
ForwardIterator hierarchy_simplify_point_set (ForwardIterator begin,
ForwardIterator end,
const unsigned int size = 10,
const double var_max = 0.333)
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("hierarchy_simplify_point_set()");
CGAL::Iterator_range<ForwardIterator> points (begin, end);
return hierarchy_simplify_point_set
(points,
CGAL::parameters::size (size).
maximum_variation (var_max));
}
#endif // CGAL_NO_DEPRECATED_CODE
/// \endcond
} // namespace CGAL

14
Point_set_processing_3/include/CGAL/jet_estimate_normals.h
View File

@ -295,7 +295,8 @@ jet_estimate_normals(
jet_estimate_normals<ConcurrencyTag>
(points, k, CGAL::Point_set_processing_3::parameters::all_default(points));
}
#ifndef CGAL_NO_DEPRECATED_CODE
// deprecated API
template <typename ConcurrencyTag,
typename ForwardIterator,
@ -304,6 +305,7 @@ template <typename ConcurrencyTag,
typename Kernel,
typename SvdTraits
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::jet_estimate_normals(), please update your code")
void
jet_estimate_normals(
ForwardIterator first, ///< iterator over the first input point.
@ -314,7 +316,6 @@ jet_estimate_normals(
const Kernel& /*kernel*/, ///< geometric traits.
unsigned int degree_fitting = 2) ///< fitting degree
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("jet_estimate_normals()");
CGAL::Iterator_range<ForwardIterator> points (first, beyond);
return jet_estimate_normals<ConcurrencyTag>
(points,
@ -333,6 +334,7 @@ template <typename ConcurrencyTag,
typename NormalMap,
typename Kernel
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::jet_estimate_normals(), please update your code")
void
jet_estimate_normals(
ForwardIterator first,
@ -349,7 +351,6 @@ jet_estimate_normals(
typedef Lapack_svd SvdTraits;
#endif
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("jet_estimate_normals()");
CGAL::Iterator_range<ForwardIterator> points (first, beyond);
return jet_estimate_normals<ConcurrencyTag>
(points,
@ -367,6 +368,7 @@ template <typename ConcurrencyTag,
typename PointMap,
typename NormalMap
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::jet_estimate_normals(), please update your code")
void
jet_estimate_normals(
ForwardIterator first, ///< iterator over the first input point.
@ -376,7 +378,6 @@ jet_estimate_normals(
unsigned int k, ///< number of neighbors.
unsigned int degree_fitting = 2)
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("jet_estimate_normals()");
CGAL::Iterator_range<ForwardIterator> points (first, beyond);
return jet_estimate_normals<ConcurrencyTag>
(points,
@ -391,6 +392,7 @@ template <typename ConcurrencyTag,
typename ForwardIterator,
typename NormalMap
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::jet_estimate_normals(), please update your code")
void
jet_estimate_normals(
ForwardIterator first, ///< iterator over the first input point.
@ -399,7 +401,6 @@ jet_estimate_normals(
unsigned int k, ///< number of neighbors.
unsigned int degree_fitting = 2)
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("jet_estimate_normals()");
CGAL::Iterator_range<ForwardIterator> points (first, beyond);
return jet_estimate_normals<ConcurrencyTag>
(points,
@ -407,7 +408,8 @@ jet_estimate_normals(
CGAL::parameters::normal_map (normal_map).
degree_fitting (degree_fitting));
}
#endif
#endif // CGAL Eigen / Lapack
#endif // CGAL_NO_DEPRECATED_CODE
/// \endcond
} //namespace CGAL

14
Point_set_processing_3/include/CGAL/jet_smooth_point_set.h
View File

@ -283,6 +283,7 @@ jet_smooth_point_set(
}
#ifndef CGAL_NO_DEPRECATED_CODE
// deprecated API
template <typename ConcurrencyTag,
typename InputIterator,
@ -290,6 +291,7 @@ template <typename ConcurrencyTag,
typename Kernel,
typename SvdTraits
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::jet_smooth_point_set(), please update your code")
void
jet_smooth_point_set(
InputIterator first, ///< iterator over the first input point.
@ -300,7 +302,6 @@ jet_smooth_point_set(
unsigned int degree_fitting = 2, ///< fitting degree
unsigned int degree_monge = 2) ///< Monge degree
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("jet_smooth_point_set()");
CGAL::Iterator_range<InputIterator> points (first, beyond);
return jet_smooth_point_set<ConcurrencyTag>
(points,
@ -318,6 +319,7 @@ template <typename ConcurrencyTag,
typename PointMap,
typename Kernel
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::jet_smooth_point_set(), please update your code")
void
jet_smooth_point_set(
InputIterator first, ///< iterator over the first input point.
@ -333,7 +335,6 @@ jet_smooth_point_set(
#else
typedef Lapack_svd SvdTraits;
#endif
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("jet_smooth_point_set()");
CGAL::Iterator_range<InputIterator> points (first, beyond);
return jet_smooth_point_set<ConcurrencyTag>
(points,
@ -341,7 +342,7 @@ jet_smooth_point_set(
CGAL::parameters::point_map (point_map).
degree_fitting (degree_fitting).
degree_monge (degree_monge).
svd_traits (SvdTraits()),
svd_traits (SvdTraits()).
geom_traits(kernel));
}
@ -350,6 +351,7 @@ template <typename ConcurrencyTag,
typename InputIterator,
typename PointMap
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::jet_smooth_point_set(), please update your code")
void
jet_smooth_point_set(
InputIterator first, ///< iterator over the first input point
@ -359,7 +361,6 @@ jet_smooth_point_set(
const unsigned int degree_fitting = 2,
const unsigned int degree_monge = 2)
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("jet_smooth_point_set()");
CGAL::Iterator_range<InputIterator> points (first, beyond);
return jet_smooth_point_set<ConcurrencyTag>
(points,
@ -373,6 +374,7 @@ jet_smooth_point_set(
template <typename ConcurrencyTag,
typename InputIterator
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::jet_smooth_point_set(), please update your code")
void
jet_smooth_point_set(
InputIterator first, ///< iterator over the first input point
@ -381,7 +383,6 @@ jet_smooth_point_set(
const unsigned int degree_fitting = 2,
const unsigned int degree_monge = 2)
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("jet_smooth_point_set()");
CGAL::Iterator_range<InputIterator> points (first, beyond);
return jet_smooth_point_set<ConcurrencyTag>
(points,
@ -389,7 +390,8 @@ jet_smooth_point_set(
CGAL::parameters::degree_fitting (degree_fitting).
degree_monge (degree_monge));
}
#endif
#endif // CGAL Eigen / Lapack
#endif // CGAL_NO_DEPRECATED_CODE
/// \endcond

14
Point_set_processing_3/include/CGAL/mst_orient_normals.h
View File

@ -645,9 +645,7 @@ mst_orient_normals(
/// \cond SKIP_IN_MANUAL
// variant with default NP
template <typename PointRange,
typename NamedParameters
>
template <typename PointRange>
typename PointRange::iterator
mst_orient_normals(
PointRange& points,
@ -656,13 +654,15 @@ mst_orient_normals(
{
return mst_orient_normals (points, k, CGAL::Point_set_processing_3::parameters::all_default(points));
}
#ifndef CGAL_NO_DEPRECATED_CODE
// deprecated API
template <typename ForwardIterator,
typename PointMap,
typename NormalMap,
typename Kernel
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::mst_orient_normals(), please update your code")
ForwardIterator
mst_orient_normals(
ForwardIterator first, ///< iterator over the first input point.
@ -672,7 +672,6 @@ mst_orient_normals(
unsigned int k, ///< number of neighbors
const Kernel& kernel) ///< geometric traits.
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("mst_orient_normals()");
CGAL::Iterator_range<ForwardIterator> points (first, beyond);
return mst_orient_normals
(points,
@ -687,6 +686,7 @@ template <typename ForwardIterator,
typename PointMap,
typename NormalMap
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::mst_orient_normals(), please update your code")
ForwardIterator
mst_orient_normals(
ForwardIterator first, ///< iterator over the first input point.
@ -695,7 +695,6 @@ mst_orient_normals(
NormalMap normal_map, ///< property map: value_type of ForwardIterator -> Vector_3.
unsigned int k) ///< number of neighbors
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("mst_orient_normals()");
CGAL::Iterator_range<ForwardIterator> points (first, beyond);
return mst_orient_normals
(points,
@ -708,6 +707,7 @@ mst_orient_normals(
template <typename ForwardIterator,
typename NormalMap
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::mst_orient_normals(), please update your code")
ForwardIterator
mst_orient_normals(
ForwardIterator first, ///< iterator over the first input point.
@ -715,13 +715,13 @@ mst_orient_normals(
NormalMap normal_map, ///< property map: value_type of ForwardIterator -> Vector_3.
unsigned int k) ///< number of neighbors
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("mst_orient_normals()");
CGAL::Iterator_range<ForwardIterator> points (first, beyond);
return mst_orient_normals
(points,
k,
CGAL::parameters::normal_map (normal_map));
}
#endif // CGAL_NO_DEPRECATED_CODE
/// \endcond

10
Point_set_processing_3/include/CGAL/pca_estimate_normals.h
View File

@ -275,7 +275,8 @@ pca_estimate_normals(
return pca_estimate_normals<ConcurrencyTag>
(points, k, CGAL::Point_set_processing_3::parameters::all_default(points));
}
#ifndef CGAL_NO_DEPRECATED_CODE
// deprecated API
template <typename ConcurrencyTag,
typename ForwardIterator,
@ -283,6 +284,7 @@ template <typename ConcurrencyTag,
typename NormalMap,
typename Kernel
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::pca_estimate_normals(), please update your code")
void
pca_estimate_normals(
ForwardIterator first, ///< iterator over the first input point.
@ -292,7 +294,6 @@ pca_estimate_normals(
unsigned int k, ///< number of neighbors.
const Kernel& /*kernel*/) ///< geometric traits.
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("pca_estimate_normals()");
CGAL::Iterator_range<ForwardIterator> points (first, beyond);
return pca_estimate_normals<ConcurrencyTag>
(points,
@ -308,6 +309,7 @@ template <typename ConcurrencyTag,
typename PointMap,
typename NormalMap
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::pca_estimate_normals(), please update your code")
void
pca_estimate_normals(
ForwardIterator first, ///< iterator over the first input point.
@ -316,7 +318,6 @@ pca_estimate_normals(
NormalMap normal_map, ///< property map: value_type of ForwardIterator -> Vector_3.
unsigned int k) ///< number of neighbors.
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("pca_estimate_normals()");
CGAL::Iterator_range<ForwardIterator> points (first, beyond);
return pca_estimate_normals<ConcurrencyTag>
(points,
@ -330,6 +331,7 @@ template <typename ConcurrencyTag,
typename ForwardIterator,
typename NormalMap
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::pca_estimate_normals(), please update your code")
void
pca_estimate_normals(
ForwardIterator first, ///< iterator over the first input point.
@ -337,13 +339,13 @@ pca_estimate_normals(
NormalMap normal_map, ///< property map: value_type of ForwardIterator -> Vector_3.
unsigned int k) ///< number of neighbors.
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("pca_estimate_normals()");
CGAL::Iterator_range<ForwardIterator> points (first, beyond);
return pca_estimate_normals<ConcurrencyTag>
(points,
k,
CGAL::parameters::normal_map (normal_map));
}
#endif // CGAL_NO_DEPRECATED_CODE
/// \endcond

11
Point_set_processing_3/include/CGAL/point_set_processing_assertions.h
View File

@ -370,15 +370,4 @@
# define CGAL_point_set_processing_expensive_exactness_warnings 1
#endif // CGAL_POINT_SET_PROCESSING_NO_WARNINGS
#undef CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API
#if defined(CGAL_POINT_SET_PROCESSING_DO_NOT_COMPILE_DEPRECATED_V1_API)
# define CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API(FCT) \
CGAL_static_assertion_msg (false, "Error: you are using the deprecated V1 API of the Point Set Processing package")
#else
# define CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API(FCT) \
std::cerr << "Warning: you are using the deprecated V1 API of the Point Set Processing\nfunction " \
<< FCT << ", please update your code." << std::endl
#endif
/// \endcond

8
Point_set_processing_3/include/CGAL/random_simplify_point_set.h
View File

@ -75,11 +75,13 @@ random_simplify_point_set(
}
/// \cond SKIP_IN_MANUAL
#ifndef CGAL_NO_DEPRECATED_CODE
// deprecated API
template <typename ForwardIterator,
typename PointMap,
typename Kernel
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::random_simplify_point_set(), please update your code")
ForwardIterator
random_simplify_point_set(
ForwardIterator first, ///< iterator over the first input point.
@ -88,7 +90,6 @@ random_simplify_point_set(
double removed_percentage, ///< percentage of points to remove.
const Kernel& /*kernel*/) ///< geometric traits.
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("random_simplify_point_set()");
CGAL::Iterator_range<ForwardIterator> points (first, beyond);
return random_simplify_point_set (points, removed_percentage);
}
@ -98,6 +99,7 @@ random_simplify_point_set(
template <typename ForwardIterator,
typename PointMap
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::random_simplify_point_set(), please update your code")
ForwardIterator
random_simplify_point_set(
ForwardIterator first, ///< iterator over the first input point
@ -105,7 +107,6 @@ random_simplify_point_set(
PointMap, ///< property map: value_type of ForwardIterator -> Point_3
double removed_percentage) ///< percentage of points to remove
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("random_simplify_point_set()");
CGAL::Iterator_range<ForwardIterator> points (first, beyond);
return random_simplify_point_set (points, removed_percentage);
}
@ -113,16 +114,17 @@ random_simplify_point_set(
// deprecated API
template <typename ForwardIterator
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::random_simplify_point_set(), please update your code")
ForwardIterator
random_simplify_point_set(
ForwardIterator first, ///< iterator over the first input point
ForwardIterator beyond, ///< past-the-end iterator
double removed_percentage) ///< percentage of points to remove
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("random_simplify_point_set()");
CGAL::Iterator_range<ForwardIterator> points (first, beyond);
return random_simplify_point_set (points, removed_percentage);
}
#endif // CGAL_NO_DEPRECATED_CODE
/// \endcond

10
Point_set_processing_3/include/CGAL/remove_outliers.h
View File

@ -235,12 +235,14 @@ remove_outliers(
{
return remove_outliers (points, k, CGAL::Point_set_processing_3::parameters::all_default(points));
}
#ifndef CGAL_NO_DEPRECATED_CODE
// deprecated API
template <typename InputIterator,
typename PointMap,
typename Kernel
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::remove_outliers(), please update your code")
InputIterator
remove_outliers(
InputIterator first, ///< iterator over the first input point.
@ -254,7 +256,6 @@ remove_outliers(
///< neighbors)
const Kernel& /*kernel*/) ///< geometric traits.
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("remove_outliers()");
CGAL::Iterator_range<InputIterator> points (first, beyond);
return remove_outliers
(points,
@ -269,6 +270,7 @@ remove_outliers(
template <typename InputIterator,
typename PointMap
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::remove_outliers(), please update your code")
InputIterator
remove_outliers(
InputIterator first, ///< iterator over the first input point
@ -279,7 +281,6 @@ remove_outliers(
double threshold_distance = 0.0) ///< minimum average squared distance to K nearest neighbors
///< for a point to be removed.
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("remove_outliers()");
CGAL::Iterator_range<InputIterator> points (first, beyond);
return remove_outliers
(points,
@ -292,6 +293,7 @@ remove_outliers(
// deprecated API
template <typename InputIterator
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::remove_outliers(), please update your code")
InputIterator
remove_outliers(
InputIterator first, ///< iterator over the first input point
@ -301,7 +303,6 @@ remove_outliers(
double threshold_distance = 0.0) ///< minimum average squared distance to K nearest neighbors
///< for a point to be removed.
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("remove_outliers()");
CGAL::Iterator_range<InputIterator> points (first, beyond);
return remove_outliers
(points,
@ -309,6 +310,7 @@ remove_outliers(
CGAL::parameters::threshold_percent (threshold_percent).
threshold_distance (threshold_distance));
}
#endif // CGAL_NO_DEPRECATED_CODE
/// \endcond

11
Point_set_processing_3/include/CGAL/structure_point_set.h
View File

@ -1539,7 +1539,8 @@ structure_point_set (const PointRange& points, ///< range of points.
(points, planes, output, epsilon,
CGAL::Point_set_processing_3::parameters::all_default(points));
}
#ifndef CGAL_NO_DEPRECATED_CODE
// deprecated API
template <typename PointRange,
typename PointMap,
@ -1550,6 +1551,7 @@ template <typename PointRange,
typename OutputIterator,
typename Kernel
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::structure_point_set(), please update your code")
OutputIterator
structure_point_set (const PointRange& points, ///< range of points.
PointMap point_map, ///< property map: value_type of `typename PointRange::const_iterator` -> `Point_3`
@ -1562,7 +1564,6 @@ structure_point_set (const PointRange& points, ///< range of points.
double epsilon, ///< size parameter.
double attraction_factor = 3.) ///< attraction factor.
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("structure_point_set()");
return structure_point_set
(points, planes, output, epsilon,
CGAL::parameters::point_map (point_map).
@ -1582,6 +1583,7 @@ template <typename PointRange,
typename IndexMap,
typename OutputIterator
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::structure_point_set(), please update your code")
OutputIterator
structure_point_set (const PointRange& points,
PointMap point_map,
@ -1593,7 +1595,6 @@ structure_point_set (const PointRange& points,
double epsilon, ///< size parameter
double attraction_factor = 3.) ///< attraction factor
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("structure_point_set()");
return structure_point_set
(points, planes, output, epsilon,
CGAL::parameters::point_map (point_map).
@ -1610,6 +1611,7 @@ template <typename PointRange,
typename IndexMap,
typename OutputIterator
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::structure_point_set(), please update your code")
OutputIterator
structure_point_set (const PointRange& points,
NormalMap normal_map,
@ -1619,14 +1621,13 @@ structure_point_set (const PointRange& points,
double epsilon, ///< size parameter
double attraction_factor = 3.) ///< attraction factor
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("structure_point_set()");
return structure_point_set
(points, planes, output, epsilon,
CGAL::parameters::normal_map (normal_map).
plane_index_map (index_map).
attraction_factor (attraction_factor));
}
#endif // CGAL_NO_DEPRECATED_CODE
/// \endcond
} //namespace CGAL

22
Point_set_processing_3/include/CGAL/vcm_estimate_normals.h
View File

@ -311,12 +311,14 @@ compute_vcm (const PointRange& points,
compute_vcm (points, ccov, offset_radius, convolution_radius,
CGAL::Point_set_processing_3::parameters::all_default (points));
}
#ifndef CGAL_NO_DEPRECATED_CODE
// deprecated API
template < class ForwardIterator,
class PointMap,
class Kernel
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::compute_vcm(), please update your code")
void
compute_vcm (ForwardIterator first,
ForwardIterator beyond,
@ -326,12 +328,12 @@ compute_vcm (ForwardIterator first,
double convolution_radius,
const Kernel & kernel)
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("compute_vcm()");
CGAL::Iterator_range<ForwardIterator> points (first, beyond);
compute_vcm (points, ccov, offset_radius, convolution_radius,
CGAL::parameters::point_map (point_map).
geom_traits (kernel));
}
#endif // CGAL_NO_DEPRECATED_CODE
/// \endcond
/// \cond SKIP_IN_MANUAL
@ -467,12 +469,14 @@ vcm_estimate_normals (PointRange& points,
CGAL::Point_set_processing_3::parameters::all_default(points));
}
#ifndef CGAL_NO_DEPRECATED_CODE
// deprecated API
template < typename ForwardIterator,
typename PointMap,
typename NormalMap,
typename VCMTraits
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::vcm_estimate_normals(), please update your code")
void
vcm_estimate_normals (ForwardIterator first, ///< iterator over the first input point.
ForwardIterator beyond, ///< past-the-end iterator over the input points.
@ -483,7 +487,6 @@ vcm_estimate_normals (ForwardIterator first, ///< iterator over the first input
VCMTraits
)
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("vcm_estimate_normals()");
CGAL::Iterator_range<ForwardIterator> points (first, beyond);
vcm_estimate_normals
(points,
@ -492,6 +495,7 @@ vcm_estimate_normals (ForwardIterator first, ///< iterator over the first input
normal_map (normal_map).
diagonalize_traits (VCMTraits()));
}
#endif // CGAL_NO_DEPRECATED_CODE
/// \endcond
@ -550,12 +554,14 @@ vcm_estimate_normals (PointRange& points,
CGAL::Point_set_processing_3::parameters::all_default(points));
}
#ifndef CGAL_NO_DEPRECATED_CODE
// deprecated API
template < typename ForwardIterator,
typename PointMap,
typename NormalMap,
typename VCMTraits
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::vcm_estimate_normals(), please update your code")
void
vcm_estimate_normals (ForwardIterator first, ///< iterator over the first input point.
ForwardIterator beyond, ///< past-the-end iterator over the input points.
@ -566,7 +572,6 @@ vcm_estimate_normals (ForwardIterator first, ///< iterator over the first input
VCMTraits
)
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("vcm_estimate_normals()");
CGAL::Iterator_range<ForwardIterator> points (first, beyond);
vcm_estimate_normals
(points,
@ -581,6 +586,7 @@ template < typename ForwardIterator,
typename PointMap,
typename NormalMap
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::vcm_estimate_normals(), please update your code")
void
vcm_estimate_normals (ForwardIterator first,
ForwardIterator beyond,
@ -589,7 +595,6 @@ vcm_estimate_normals (ForwardIterator first,
double offset_radius,
double convolution_radius)
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("vcm_estimate_normals()");
CGAL::Iterator_range<ForwardIterator> points (first, beyond);
vcm_estimate_normals
(points,
@ -603,6 +608,7 @@ template < typename ForwardIterator,
typename PointMap,
typename NormalMap
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::vcm_estimate_normals(), please update your code")
void
vcm_estimate_normals (ForwardIterator first,
ForwardIterator beyond,
@ -611,7 +617,6 @@ vcm_estimate_normals (ForwardIterator first,
double offset_radius,
unsigned int nb_neighbors_convolve)
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("vcm_estimate_normals()");
CGAL::Iterator_range<ForwardIterator> points (first, beyond);
vcm_estimate_normals
(points,
@ -625,13 +630,13 @@ vcm_estimate_normals (ForwardIterator first,
template < typename ForwardIterator,
typename NormalMap
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::vcm_estimate_normals(), please update your code")
void
vcm_estimate_normals (ForwardIterator first,
ForwardIterator beyond,
NormalMap normal_map,
double offset_radius,
double convolution_radius) {
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("vcm_estimate_normals()");
CGAL::Iterator_range<ForwardIterator> points (first, beyond);
vcm_estimate_normals
(points,
@ -643,19 +648,20 @@ vcm_estimate_normals (ForwardIterator first,
template < typename ForwardIterator,
typename NormalMap
>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::vcm_estimate_normals(), please update your code")
void
vcm_estimate_normals (ForwardIterator first,
ForwardIterator beyond,
NormalMap normal_map,
double offset_radius,
unsigned int nb_neighbors_convolve) {
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("vcm_estimate_normals()");
CGAL::Iterator_range<ForwardIterator> points (first, beyond);
vcm_estimate_normals
(points,
offset_radius, nb_neighbors_convolve,
CGAL::parameters::normal_map (normal_map));
}
#endif // CGAL_NO_DEPRECATED_CODE
/// \endcond
} // namespace CGAL

17
Point_set_processing_3/include/CGAL/wlop_simplify_and_regularize_point_set.h
View File

@ -511,10 +511,7 @@ wlop_simplify_and_regularize_point_set(
if (radius < 0)
{
const unsigned int nb_neighbors = 6; // 1 ring
FT average_spacing = CGAL::compute_average_spacing<ConcurrencyTag>(
points.begin(), points.end(),
point_map,
nb_neighbors);
FT average_spacing = CGAL::compute_average_spacing<ConcurrencyTag>(points, nb_neighbors, np);
radius = average_spacing * 8.0;
#ifdef CGAL_PSP3_VERBOSE
@ -656,12 +653,14 @@ wlop_simplify_and_regularize_point_set(
(points, output, CGAL::Point_set_processing_3::parameters::all_default(points));
}
#ifndef CGAL_NO_DEPRECATED_CODE
// deprecated API
template <typename ConcurrencyTag,
typename OutputIterator,
typename RandomAccessIterator,
typename PointMap,
typename Kernel>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::wlop_simplify_and_regularize_point_set(), please update your code")
OutputIterator
wlop_simplify_and_regularize_point_set(
RandomAccessIterator first, ///< random-access iterator to the first input point.
@ -686,7 +685,6 @@ wlop_simplify_and_regularize_point_set(
const Kernel& ///< geometric traits.
)
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("wlop_simplify_and_regularize_point_set()");
CGAL::Iterator_range<RandomAccessIterator> points (first, beyond);
return wlop_simplify_and_regularize_point_set<ConcurrencyTag>
(points, output,
@ -698,12 +696,13 @@ wlop_simplify_and_regularize_point_set(
geom_traits (Kernel()));
}
/// @cond SKIP_IN_MANUAL
// This variant deduces the kernel from the iterator type.
// deprecated API
template <typename ConcurrencyTag,
typename OutputIterator,
typename RandomAccessIterator,
typename PointMap>
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::wlop_simplify_and_regularize_point_set(), please update your code")
OutputIterator
wlop_simplify_and_regularize_point_set(
RandomAccessIterator first, ///< iterator over the first input point
@ -717,7 +716,6 @@ wlop_simplify_and_regularize_point_set(
/// to generate more rugularized result.
)
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("wlop_simplify_and_regularize_point_set()");
CGAL::Iterator_range<RandomAccessIterator> points (first, beyond);
return wlop_simplify_and_regularize_point_set<ConcurrencyTag>
(points, output,
@ -732,6 +730,7 @@ wlop_simplify_and_regularize_point_set(
template <typename ConcurrencyTag,
typename OutputIterator,
typename RandomAccessIterator >
CGAL_DEPRECATED_MSG("you are using the deprecated V1 API of CGAL::wlop_simplify_and_regularize_point_set(), please update your code")
OutputIterator
wlop_simplify_and_regularize_point_set(
RandomAccessIterator first, ///< iterator to the first input point.
@ -744,7 +743,6 @@ wlop_simplify_and_regularize_point_set(
///to generate a more uniform result.
)
{
CGAL_POINT_SET_PROCESSING_DEPRECATED_V1_API("wlop_simplify_and_regularize_point_set()");
CGAL::Iterator_range<RandomAccessIterator> points (first, beyond);
return wlop_simplify_and_regularize_point_set<ConcurrencyTag>
(points, output,
@ -753,6 +751,7 @@ wlop_simplify_and_regularize_point_set(
number_of_iterations(max_iter_number).
require_uniform_sampling (require_uniform_sampling));
}
#endif // CGAL_NO_DEPRECATED_CODE
/// @endcond
} //namespace CGAL

4
Polyhedron/demo/Polyhedron/config.h
View File

@ -17,8 +17,4 @@
# define CGAL_POLYHEDRON_DEMO_USE_SURFACE_MESHER
#endif
#ifndef CGAL_POINT_SET_PROCESSING_DO_NOT_COMPILE_DEPRECATED_V1_API
# define CGAL_POINT_SET_PROCESSING_DO_NOT_COMPILE_DEPRECATED_V1_API
#endif
#endif // CGAL_POLYHEDRON_DEMO_CONFIG_H