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

Fix return-types incorrectly changed from FT to double

This commit is contained in:
Simon Giraudot 2018-01-10 11:47:24 +01:00
parent e00c4f67d6
commit 78afc3959c
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -155,13 +155,20 @@ compute_average_spacing(const typename Kernel::Point_3& query, ///< 3D point who
\cgalParamBegin{geom_traits} an instance of a geometric traits class, model of `Kernel`\cgalParamEnd
\cgalNamedParamsEnd
\return average spacing (scalar).
\return average spacing (scalar). The return type `FT` is a number type. It is
either deduced from the `geom_traits` \ref psp_namedparameters "Named Parameters" if provided,
or the geometric traits class deduced from the point property map
of `points`.
*/
template <typename ConcurrencyTag,
typename PointRange,
typename NamedParameters
>
double
#ifdef DOXYGEN_RUNNING
FT
#else
typename Point_set_processing_3::GetK<PointRange, NamedParameters>::Kernel::FT
#endif
compute_average_spacing(
const PointRange& points,
unsigned int k,
@ -234,7 +241,8 @@ compute_average_spacing(
// variant with default NP
template <typename ConcurrencyTag, typename PointRange>
double compute_average_spacing(
typename Kernel_traits<typename PointRange::iterator::value_type>::Kernel::FT
compute_average_spacing(
const PointRange& points,
unsigned int k) ///< number of neighbors.
{

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

@ -705,12 +705,19 @@ estimate_local_range_scales(
\note This function accepts both 2D and 3D points.
\return The estimated scale in the range sense.
\return The estimated scale in the range sense. The return type `FT` is a number type. It is
either deduced from the `geom_traits` \ref psp_namedparameters "Named Parameters" if provided,
or the geometric traits class deduced from the point property map
of `points`.
*/
template <typename PointRange,
typename NamedParameters
>
double
#ifdef DOXYGEN_RUNNING
FT
#else
typename Point_set_processing_3::GetK<PointRange, NamedParameters>::Kernel::FT
#endif
estimate_global_range_scale(
const PointRange& points,
const NamedParameters& np)
@ -724,7 +731,7 @@ estimate_global_range_scale(
/// \cond SKIP_IN_MANUAL
// variant with default NP
template <typename PointRange>
double
typename Kernel_traits<typename PointRange::iterator::value_type>::Kernel::FT
estimate_global_range_scale(const PointRange& points)
{
return estimate_global_range_scale