3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed memory leak in ExtrusionPath::Collection and return collection items by reference

Browse source
This commit is contained in:
Alessandro Ranellucci 2013-08-31 00:37:17 +02:00
parent bb45437526
commit d2e4bba074
3 changed files with 38 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
xs/xsp/ExtrusionEntityCollection.xsp
View file

@ -7,7 +7,6 @@
%name{Slic3r::ExtrusionPath::Collection} class ExtrusionEntityCollection {
%name{_new} ExtrusionEntityCollection();
~ExtrusionEntityCollection();
void clear()
%code{% THIS->entities.clear(); %};
ExtrusionEntityCollection* chained_path(bool no_reverse)
@ -16,6 +15,14 @@
%code{% const char* CLASS = "Slic3r::ExtrusionPath::Collection"; RETVAL = THIS->chained_path_from(start_near, no_reverse); %};
%{
void
ExtrusionEntityCollection::DESTROY()
CODE:
for (ExtrusionEntitiesPtr::iterator it = THIS->entities.begin(); it != THIS->entities.end(); ++it) {
delete *it;
}
delete THIS;
SV*
ExtrusionEntityCollection::arrayref()
CODE:
@ -24,13 +31,13 @@ ExtrusionEntityCollection::arrayref()
int i = 0;
for (ExtrusionEntitiesPtr::iterator it = THIS->entities.begin(); it != THIS->entities.end(); ++it) {
SV* sv = newSV(0);
// return COPIES
// return our item by reference
if (ExtrusionPath* path = dynamic_cast<ExtrusionPath*>(*it)) {
sv_setref_pv( sv, "Slic3r::ExtrusionPath", new ExtrusionPath(*(ExtrusionPath*)*it) );
} else if (ExtrusionLoop* path = dynamic_cast<ExtrusionLoop*>(*it)) {
sv_setref_pv( sv, "Slic3r::ExtrusionLoop", new ExtrusionLoop(*(ExtrusionLoop*)*it) );
sv_setref_pv( sv, "Slic3r::ExtrusionPath::Ref", path );
} else if (ExtrusionLoop* loop = dynamic_cast<ExtrusionLoop*>(*it)) {
sv_setref_pv( sv, "Slic3r::ExtrusionLoop::Ref", loop );
} else {
sv_setref_pv( sv, "Slic3r::ExtrusionPath::Collection", new ExtrusionEntityCollection(*(ExtrusionEntityCollection*)*it) );
sv_setref_pv( sv, "Slic3r::ExtrusionPath::Collection::Ref", *it );
}
av_store(av, i++, sv);
}