juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-17 02:22:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix of admesh import due to boost::pool::destroy taking O(n).

Browse Source 
Why on earth?!
This commit is contained in:
bubnikv
2019-06-14 11:07:07 +02:00
parent d750d4f925
commit 77954a13b9
2 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/admesh/connect.cpp
View File

@@ -130,18 +130,12 @@ struct HashTableEdges {
this->heads[i] = this->tail;
}
~HashTableEdges() {
for (int i = 0; i < this->M; ++ i) {
for (HashEdge *temp = this->heads[i]; this->heads[i] != this->tail; temp = this->heads[i]) {
this->heads[i] = this->heads[i]->next;
pool.destroy(temp);
#ifndef NDEBUG
for (int i = 0; i < this->M; ++ i)
for (HashEdge *temp = this->heads[i]; this->heads[i] != this->tail; temp = this->heads[i])
++ this->freed;
#endif /* NDEBUG */
}
}
this->heads.clear();
pool.destroy(this->tail);
this->tail = nullptr;
#endif /* NDEBUG */
}
void insert_edge_exact(stl_file *stl, const HashEdge &edge)
@@ -197,7 +191,7 @@ private:
match_neighbors(edge, *link);
// Delete the matched edge from the list.
this->heads[chain_number] = link->next;
pool.destroy(link);
// pool.destroy(link);
#ifndef NDEBUG
++ this->freed;
#endif /* NDEBUG */
@@ -224,7 +218,7 @@ private:
// Delete the matched edge from the list.
HashEdge *temp = link->next;
link->next = link->next->next;
pool.destroy(temp);
// pool.destroy(temp);
#ifndef NDEBUG
++ this->freed;
#endif /* NDEBUG */