GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-05-12 12:18:09 +08:00
Code Issues Actions Packages Projects Releases 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
xs/lib/Slic3r/XS.pm
View File

@ -60,6 +60,11 @@ sub new {
return $self; return $self;
} }
package Slic3r::ExtrusionPath::Collection::Ref;
our @ISA = 'Slic3r::ExtrusionPath::Collection';
sub DESTROY {}
package Slic3r::ExtrusionLoop; package Slic3r::ExtrusionLoop;
use overload use overload
'@{}' => sub { $_[0]->arrayref }, '@{}' => sub { $_[0]->arrayref },
@ -87,6 +92,11 @@ sub clone {
); );
} }
package Slic3r::ExtrusionLoop::Ref;
our @ISA = 'Slic3r::ExtrusionLoop';
sub DESTROY {}
package Slic3r::ExtrusionPath; package Slic3r::ExtrusionPath;
use overload use overload
'@{}' => sub { $_[0]->arrayref }, '@{}' => sub { $_[0]->arrayref },
@ -114,6 +124,11 @@ sub clone {
); );
} }
package Slic3r::ExtrusionPath::Ref;
our @ISA = 'Slic3r::ExtrusionPath';
sub DESTROY {}
package Slic3r::Surface; package Slic3r::Surface;
sub new { sub new {

13
xs/src/ExtrusionEntityCollection.cpp
View File

@ -5,7 +5,11 @@ namespace Slic3r {
ExtrusionEntityCollection* ExtrusionEntityCollection*
ExtrusionEntityCollection::clone() const ExtrusionEntityCollection::clone() const
{ {
return new ExtrusionEntityCollection (*this); ExtrusionEntityCollection* collection = new ExtrusionEntityCollection (*this);
for (ExtrusionEntitiesPtr::iterator it = collection->entities.begin(); it != collection->entities.end(); ++it) {
*it = (*it)->clone();
}
return collection;
} }
void void
@ -43,7 +47,11 @@ ExtrusionEntityCollection::chained_path_from(Point* start_near, bool no_reverse)
{ {
if (this->no_sort) return new ExtrusionEntityCollection(*this); if (this->no_sort) return new ExtrusionEntityCollection(*this);
ExtrusionEntityCollection* retval = new ExtrusionEntityCollection; ExtrusionEntityCollection* retval = new ExtrusionEntityCollection;
ExtrusionEntitiesPtr my_paths = this->entities;
ExtrusionEntitiesPtr my_paths;
for (ExtrusionEntitiesPtr::const_iterator it = this->entities.begin(); it != this->entities.end(); ++it) {
my_paths.push_back((*it)->clone());
}
Points endpoints; Points endpoints;
for (ExtrusionEntitiesPtr::iterator it = my_paths.begin(); it != my_paths.end(); ++it) { for (ExtrusionEntitiesPtr::iterator it = my_paths.begin(); it != my_paths.end(); ++it) {
@ -60,7 +68,6 @@ ExtrusionEntityCollection::chained_path_from(Point* start_near, bool no_reverse)
int start_index = start_near->nearest_point_index(endpoints); int start_index = start_near->nearest_point_index(endpoints);
int path_index = start_index/2; int path_index = start_index/2;
if (start_index % 2 && !no_reverse) { if (start_index % 2 && !no_reverse) {
my_paths.at(path_index) = my_paths.at(path_index)->clone(); // maybe we should clone them all when building my_paths?
my_paths.at(path_index)->reverse(); my_paths.at(path_index)->reverse();
} }
retval->entities.push_back(my_paths.at(path_index)); retval->entities.push_back(my_paths.at(path_index));

19
xs/xsp/ExtrusionEntityCollection.xsp
View File

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