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

operator* between enum and floating type is deprecated, fix warning 

Mirror 612d6772b9
This commit is contained in:
Mael Rouxel-Labbé 2022-10-27 12:47:30 +02:00
parent cb83e20ac7
commit 3e72a62aff
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Periodic_3_mesh_3/include/CGAL/Periodic_3_mesh_3/Protect_edges_sizing_field.h
View File

@ -2091,6 +2091,7 @@ insert_balls(const Vertex_handle& vp,
// n = 2(d-sq) / (sp+sq) // n = 2(d-sq) / (sp+sq)
// ======================= // =======================
const FT d_signF = static_cast<FT>(d_sign);
int n = static_cast<int>(std::floor(FT(2)*(d-sq) / (sp+sq))+.5); int n = static_cast<int>(std::floor(FT(2)*(d-sq) / (sp+sq))+.5);
// if(minimal_weight_ != 0 && n == 0) return; // if(minimal_weight_ != 0 && n == 0) return;
@ -2113,10 +2114,8 @@ insert_balls(const Vertex_handle& vp,
curve_index, d_sign) curve_index, d_sign)
<< ")\n"; << ")\n";
#endif #endif
const FT sgn = (d_sign == CGAL::POSITIVE) ? 1.
: (d_sign == CGAL::NEGATIVE ? -1. : 0.);
const Bare_point new_point = const Bare_point new_point =
domain_.construct_point_on_curve(vpp, curve_index, sgn * d / 2); domain_.construct_point_on_curve(vpp, curve_index, d_signF * d / 2);
const int dim = 1; // new_point is on edge const int dim = 1; // new_point is on edge
const Index index = domain_.index_from_curve_index(curve_index); const Index index = domain_.index_from_curve_index(curve_index);
const FT point_weight = CGAL::square(size_(new_point, dim, index)); const FT point_weight = CGAL::square(size_(new_point, dim, index));
@ -2162,7 +2161,6 @@ insert_balls(const Vertex_handle& vp,
FT norm_step_size = dleft_frac * step_size; FT norm_step_size = dleft_frac * step_size;
// Initial distance // Initial distance
FT d_signF = static_cast<FT>(d_sign);
FT pt_dist = d_signF * norm_step_size; FT pt_dist = d_signF * norm_step_size;
Vertex_handle prev = vp; Vertex_handle prev = vp;