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

Fix passing big parameters by value in SNC_io_parser.h

This commit is contained in:
Giles Bathgate 2020-11-26 18:22:24 +00:00
parent ef13599d96
commit 0ff1aa98ba
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Nef_3/include/CGAL/Nef_3/SNC_io_parser.h
View File

@ -127,9 +127,9 @@ class moreLeft : public T {
typedef typename T::RT RT; typedef typename T::RT RT;
public: public:
moreLeft(T D) : T(D) {} moreLeft(const T& D) : T(D) {}
int operator()(SHalfedge_handle se1, SHalfedge_handle se2) { int operator()(SHalfedge_handle se1, SHalfedge_handle se2) const {
CGAL_assertion(se1 != SHalfedge_handle()); CGAL_assertion(se1 != SHalfedge_handle());
if(se2 == SHalfedge_handle()) if(se2 == SHalfedge_handle())
@ -356,7 +356,7 @@ class sort_sface_cycle_entries : public SNC_decorator<T> {
typedef typename T::Vector_3 Vector_3; typedef typename T::Vector_3 Vector_3;
public: public:
sort_sface_cycle_entries(T D) : Base(D) {} sort_sface_cycle_entries(T& D) : Base(D) {}
bool operator() (Object_handle o1, Object_handle o2) const { bool operator() (Object_handle o1, Object_handle o2) const {
CGAL_NEF_TRACEN("sort sface cycles "); CGAL_NEF_TRACEN("sort sface cycles ");
@ -442,11 +442,11 @@ class sort_sfaces : public SNC_decorator<T> {
if(sf1->center_vertex() != sf2->center_vertex()) if(sf1->center_vertex() != sf2->center_vertex())
return SORT(sf1->center_vertex(), sf2->center_vertex()); return SORT(sf1->center_vertex(), sf2->center_vertex());
// sort_sface_cycle_entries<Base> sort_cycles((Base) *this); // sort_sface_cycle_entries<Base> sort_cycles(*this);
// return sort_cycles(*sf1->sface_cycles_begin(), *sf2->sface_cycles_begin()); // return sort_cycles(*sf1->sface_cycles_begin(), *sf2->sface_cycles_begin());
SM_decorator SD(&*sf1->center_vertex()); SM_decorator SD(&*sf1->center_vertex());
moreLeft<Base> ml((Base) *this); moreLeft<Base> ml(*this);
Vector_3 plus(1,0,0); Vector_3 plus(1,0,0);
SFace_cycle_iterator fc; SFace_cycle_iterator fc;
@ -563,7 +563,7 @@ class sort_facet_cycle_entries : public T {
typedef typename T::Vector_3 Vector_3; typedef typename T::Vector_3 Vector_3;
public: public:
sort_facet_cycle_entries(T D) : T(D) {} sort_facet_cycle_entries(const T& D) : T(D) {}
bool operator() (Object_handle o1, Object_handle o2) const { bool operator() (Object_handle o1, Object_handle o2) const {
@ -611,7 +611,7 @@ class sort_shell_entries : public T {
typedef typename T::Point_3 Point_3; typedef typename T::Point_3 Point_3;
public: public:
sort_shell_entries(T D) : T(D) {} sort_shell_entries(const T& D) : T(D) {}
bool operator() (Object_handle o1, Object_handle o2) const { bool operator() (Object_handle o1, Object_handle o2) const {
SFace_handle sf1, sf2; SFace_handle sf1, sf2;
@ -1076,7 +1076,7 @@ public:
{ Self O(os,W, sort); O.print(); } { Self O(os,W, sort); O.print(); }
template <typename Iter, typename Index> template <typename Iter, typename Index>
void output_sorted_indexes(Iter begin, Iter end, Index i) const { void output_sorted_indexes(Iter begin, Iter end, const Index& i) const {
int low = i[begin]; int low = i[begin];
int high = low; int high = low;
for(Iter it=begin; it != end; it++) { for(Iter it=begin; it != end; it++) {
@ -1193,7 +1193,7 @@ SNC_io_parser<EW>::SNC_io_parser(std::ostream& os, SNC_structure& W,
} }
} }
fi->plane() = normalized(fi->plane()); fi->plane() = normalized(fi->plane());
fi->boundary_entry_objects().sort(sort_facet_cycle_entries<Base>((Base) *this)); fi->boundary_entry_objects().sort(sort_facet_cycle_entries<Base>(*this));
} }
FL.push_back(fi); FL.push_back(fi);
} }
@ -1262,7 +1262,7 @@ SNC_io_parser<EW>::SNC_io_parser(std::ostream& os, SNC_structure& W,
*fc = make_object(se); *fc = make_object(se);
} }
} }
sfi->boundary_entry_objects().sort(sort_sface_cycle_entries<Base>((Base) *this)); sfi->boundary_entry_objects().sort(sort_sface_cycle_entries<Base>(*this));
} }
SFL.push_back(sfi); SFL.push_back(sfi);
} }
@ -1287,7 +1287,7 @@ SNC_io_parser<EW>::SNC_io_parser(std::ostream& os, SNC_structure& W,
visit_shell_objects(SFace_handle(it),findMinSF); visit_shell_objects(SFace_handle(it),findMinSF);
*it = make_object(findMinSF.minimal_sface()); *it = make_object(findMinSF.minimal_sface());
} }
ci->shell_entry_objects().sort(sort_shell_entries<Base>((Base)*this)); ci->shell_entry_objects().sort(sort_shell_entries<Base>(*this));
} }
CL.push_back(ci); CL.push_back(ci);
} }