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

forgot to update demo code after Triple->array changes

This commit is contained in:
Sylvain Pion 2008-07-27 11:40:49 +00:00
parent 24699dda52
commit edcedb11fd
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Circular_kernel_2/include/CGAL/IO/Dxf_reader_doubles.h
View File

@ -137,7 +137,7 @@ private:
is >> r; is >> r;
FT rft(r); FT rft(r);
circ = Circle_2(cx,cy,rft); circ = CGALi::make_array(cx,cy,rft);
} }
@ -176,7 +176,7 @@ read_polygon(std::istream& is, Polygon& poly)
} else { } else {
CGAL_assertion(n == 0); CGAL_assertion(n == 0);
} }
poly.push_back(Point_2_and_bulge(x,y, len)); poly.push_back(CGALi::make_array(x,y, len));
} }
} while (str != "SEQEND"); } while (str != "SEQEND");

10
Circular_kernel_2/include/CGAL/IO/Dxf_variant_reader.h
View File

@ -68,7 +68,7 @@ template<class CK,class Circular_arc_2, class Line_arc_2, class OutputIterator>
for(typename Circles::iterator it = circles.begin(); it != circles.end(); it++){ for(typename Circles::iterator it = circles.begin(); it != circles.end(); it++){
Arc arc = typename CK::Construct_circular_arc_2()(typename CK::Construct_circle_2()(typename CK::Construct_point_2()(it->first, it->second), FT(it->third))); Arc arc = typename CK::Construct_circular_arc_2()(typename CK::Construct_circle_2()(typename CK::Construct_point_2()((*it)[0], (*it)[1]), FT((*it)[2])));
*res++ = arc; *res++ = arc;
} }
@ -83,21 +83,21 @@ template<class CK,class Circular_arc_2, class Line_arc_2, class OutputIterator>
for(typename Polygons::iterator it = polygons.begin(); it != polygons.end(); it++){ for(typename Polygons::iterator it = polygons.begin(); it != polygons.end(); it++){
typename Polygon::iterator pit = it->begin(); typename Polygon::iterator pit = it->begin();
std::pair<double,double> xyfirst = std::make_pair(pit->first, pit->second); std::pair<double,double> xyfirst = std::make_pair((*pit)[0], (*pit)[1]);
std::pair<double,double> xyps, xypt = std::make_pair(pit->first, pit->second); std::pair<double,double> xyps, xypt = std::make_pair((*pit)[0], (*pit)[1]);
Point_2 ps, pt = typename CK::Construct_point_2()(xypt.first, xypt.second); Point_2 ps, pt = typename CK::Construct_point_2()(xypt.first, xypt.second);
Point_2 first = pt; Point_2 first = pt;
while(true){ while(true){
xyps = xypt; xyps = xypt;
ps = pt; ps = pt;
bulge = pit->third; bulge = (*pit)[2];
pit++; pit++;
if(pit ==it->end()){ if(pit ==it->end()){
break; break;
} }
xypt = std::make_pair(pit->first, pit->second); xypt = std::make_pair((*pit)[0], (*pit)[1]);
pt = typename CK::Construct_point_2()(xypt.first, xypt.second); pt = typename CK::Construct_point_2()(xypt.first, xypt.second);
p_cap_it = points.find(xyps); p_cap_it = points.find(xyps);