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

Merge pull request #5426 from sgiraudot/PSP-RANSAC-Fix_warnings-GF 

[PSP/RANSAC] Fix warnings
This commit is contained in:
Laurent Rineau 2021-03-03 17:33:05 +01:00
parent 83244deabb 26793aeaea
commit 3621aaaf3e
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -212,7 +212,7 @@ update_new_point(
for (unsigned int j = 0; j < candidate_num; j++) for (unsigned int j = 0; j < candidate_num; j++)
{ {
FT psi = std::exp(-std::pow(1 - normal_cadidate[j] * t.normal, 2) FT psi = std::exp(-std::pow(FT(1) - normal_cadidate[j] * t.normal, FT(2))
/ sharpness_bandwidth); / sharpness_bandwidth);
FT project_diff_t_v = (t.pt - new_v.pt) * t.normal; FT project_diff_t_v = (t.pt - new_v.pt) * t.normal;
FT weight = psi * theta; FT weight = psi * theta;
@ -433,7 +433,8 @@ edge_aware_upsample_point_set(
FT(neighbor_radius)); FT(neighbor_radius));
// //
FT cos_sigma = static_cast<FT>(std::cos(CGAL::to_double(sharpness_angle) / 180.0 * CGAL_PI)); FT cos_sigma = static_cast<FT>(std::cos(FT(CGAL::to_double(sharpness_angle))
/ FT(180) * FT(CGAL_PI)));
FT sharpness_bandwidth = std::pow((CGAL::max)((FT)1e-8, (FT)1.0 - cos_sigma), 2); FT sharpness_bandwidth = std::pow((CGAL::max)((FT)1e-8, (FT)1.0 - cos_sigma), 2);
FT sum_density = 0.0; FT sum_density = 0.0;

6
Shape_detection/include/CGAL/Shape_detection/Efficient_RANSAC/Efficient_RANSAC.h
View File

@ -1030,8 +1030,10 @@ namespace CGAL {
} }
inline FT stop_probability(std::size_t largest_candidate, std::size_t num_pts, std::size_t num_candidates, std::size_t octree_depth) const { inline FT stop_probability(std::size_t largest_candidate, std::size_t num_pts, std::size_t num_candidates, std::size_t octree_depth) const {
return (std::min<FT>)(std::pow((FT) 1.f - (FT) largest_candidate return (std::min<FT>)(std::pow(FT(1) - FT(largest_candidate)
/ (FT(num_pts) * (octree_depth+1) * (1 << (m_required_samples - 1))), (int) num_candidates), (FT) 1); / (FT(num_pts) * FT(octree_depth+1)
* FT(1 << (m_required_samples - 1))),
int(num_candidates)), FT(1));
} }
private: private: