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

remove another use of deprecated API

This commit is contained in:
Sébastien Loriot 2023-08-16 09:02:28 +02:00
parent eada3ee8ca
commit d8a6478b57
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
CGAL_ipelets/include/CGAL/CGAL_Ipelet_base_v7.h
View File

@ -822,41 +822,34 @@ public:
CGAL::Cartesian_converter<Kernel,SK> conv; CGAL::Cartesian_converter<Kernel,SK> conv;
Exact_circle_2 exact_circle=conv(approx_circle); Exact_circle_2 exact_circle=conv(approx_circle);
typedef std::pair<Circular_arc_point_2,unsigned> Cp2_mult;
SK::Intersect_2 inter=SK().intersect_2_object(); SK::Intersect_2 inter=SK().intersect_2_object();
std::vector< std::pair<Circular_arc_point_2,unsigned> > points; std::vector< Cp2_mult > points;
points.reserve(8); points.reserve(8);
std::vector<CGAL::Object> ints; std::vector< Cp2_mult > ints;
ints.reserve(2); ints.reserve(2);
std::pair<Circular_arc_point_2,unsigned> tmp_pt;
int indices[8]={-1,-1,-1,-1,-1,-1,-1,-1}; int indices[8]={-1,-1,-1,-1,-1,-1,-1,-1};
for (unsigned i=0;i!=4;++i){ for (unsigned i=0;i!=4;++i){
ints.clear(); ints.clear();
SK::Segment_2 S(conv(bbox[i]),conv(bbox[(i+1)%4])); SK::Segment_2 S(conv(bbox[i]),conv(bbox[(i+1)%4]));
inter(exact_circle,SK::Line_arc_2(S),std::back_inserter(ints)); inter(exact_circle,SK::Line_arc_2(S),dispatch_or_drop_output<Cp2_mult>(std::back_inserter(ints)));
unsigned index=0; unsigned index=0;
bool ok=true;
switch (ints.size()){ switch (ints.size()){
case 1: case 1:
ok=CGAL::assign(tmp_pt,ints[0]); points.push_back(ints[0]);
CGAL_assertion(ok); CGAL_USE(ok);
points.push_back(tmp_pt);
index=points.size()-1; index=points.size()-1;
indices[i]=index; indices[i]=index;
indices[(i+1)%4+4]=index; indices[(i+1)%4+4]=index;
break; break;
case 2: case 2:
int right_ind=i<2?0:1; int right_ind=i<2?0:1;
ok=CGAL::assign(tmp_pt,ints[right_ind]); points.push_back(ints[right_ind]);
CGAL_assertion(ok); CGAL_USE(ok);
points.push_back(tmp_pt);
index=points.size()-1; index=points.size()-1;
indices[i]=index; indices[i]=index;
ok=CGAL::assign(tmp_pt,ints[(right_ind+1)%2]); points.push_back(ints[(right_ind+1)%2]);
CGAL_assertion(ok); CGAL_USE(ok);
points.push_back(tmp_pt);
index=points.size()-1; index=points.size()-1;
indices[(i+1)%4+4]=index; indices[(i+1)%4+4]=index;
break; break;