haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed double freeing of some of Cairo paths.

This commit is contained in:
Maciej Suminski 2013-05-14 10:42:56 +02:00
parent 1b1216e53d
commit c55e063745
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/gal/cairo/cairo_gal.cpp
View File

@ -686,8 +686,7 @@ void CAIRO_GAL::DeleteGroup( int aGroupNumber )
{ {
if( it->command == CMD_FILL_PATH || it->command == CMD_STROKE_PATH ) if( it->command == CMD_FILL_PATH || it->command == CMD_STROKE_PATH )
{ {
if( it->cairoPath->status == CAIRO_STATUS_SUCCESS ) cairo_path_destroy( it->cairoPath );
cairo_path_destroy( it->cairoPath );
} }
} }
@ -839,13 +838,12 @@ void CAIRO_GAL::storePath()
// then check, if the path needs to be stroked/filled and // then check, if the path needs to be stroked/filled and
// add this command to the group list; // add this command to the group list;
cairo_path_t* path = cairo_copy_path( cairoImage );
// pathList.push_back( path ); // FIXME: it's not used anywhere else? // pathList.push_back( path ); // FIXME: it's not used anywhere else?
if( isStrokeEnabled ) if( isStrokeEnabled )
{ {
GroupElement groupElement; GroupElement groupElement;
groupElement.cairoPath = path; groupElement.cairoPath = cairo_copy_path( cairoImage );
groupElement.command = CMD_STROKE_PATH; groupElement.command = CMD_STROKE_PATH;
groups.back().push_back( groupElement ); groups.back().push_back( groupElement );
} }
@ -853,7 +851,7 @@ void CAIRO_GAL::storePath()
if( isFillEnabled ) if( isFillEnabled )
{ {
GroupElement groupElement; GroupElement groupElement;
groupElement.cairoPath = path; groupElement.cairoPath = cairo_copy_path( cairoImage );
groupElement.command = CMD_FILL_PATH; groupElement.command = CMD_FILL_PATH;
groups.back().push_back( groupElement ); groups.back().push_back( groupElement );
} }