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

Fix memory management with DIMENSION shapes 

The previous way leaked the temporary SHAPE that was used
to construct the shared_ptr. Also, emplace_back shouldn't
be used with make_shared - since we already have the shared_ptr
and emplace_back will try to construct a new one.
This commit is contained in:
Ian McInerney 2020-10-01 20:11:35 +01:00
parent f736cc15b6
commit ff463842a8
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pcbnew/class_dimension.cpp
View File

@ -108,9 +108,9 @@ void DIMENSION::updateText()
template<typename ShapeType> template<typename ShapeType>
void DIMENSION::addShape( ShapeType* aShape ) void DIMENSION::addShape( const ShapeType& aShape )
{ {
m_shapes.emplace_back( std::make_shared<ShapeType>( *aShape ) ); m_shapes.push_back( std::make_shared<ShapeType>( aShape ) );
} }
@ -587,12 +587,12 @@ void ALIGNED_DIMENSION::updateGeometry()
VECTOR2I extStart( m_start ); VECTOR2I extStart( m_start );
extStart += extension.Resize( m_extensionOffset ); extStart += extension.Resize( m_extensionOffset );
addShape( new SHAPE_SEGMENT( extStart, extStart + extension.Resize( extensionHeight ) ) ); addShape( SHAPE_SEGMENT( extStart, extStart + extension.Resize( extensionHeight ) ) );
extStart = VECTOR2I( m_end ); extStart = VECTOR2I( m_end );
extStart += extension.Resize( m_extensionOffset ); extStart += extension.Resize( m_extensionOffset );
addShape( new SHAPE_SEGMENT( extStart, extStart + extension.Resize( extensionHeight ) ) ); addShape( SHAPE_SEGMENT( extStart, extStart + extension.Resize( extensionHeight ) ) );
// Add crossbar // Add crossbar
VECTOR2I crossBarDistance = sign( m_height ) * extension.Resize( m_height ); VECTOR2I crossBarDistance = sign( m_height ) * extension.Resize( m_height );
@ -744,7 +744,7 @@ void ORTHOGONAL_DIMENSION::updateGeometry()
VECTOR2I extStart( m_start ); VECTOR2I extStart( m_start );
extStart += extension.Resize( m_extensionOffset ); extStart += extension.Resize( m_extensionOffset );
addShape( new SHAPE_SEGMENT( extStart, extStart + extension.Resize( extensionHeight ) ) ); addShape( SHAPE_SEGMENT( extStart, extStart + extension.Resize( extensionHeight ) ) );
// Add crossbar // Add crossbar
VECTOR2I crossBarDistance = sign( m_height ) * extension.Resize( m_height ); VECTOR2I crossBarDistance = sign( m_height ) * extension.Resize( m_height );
@ -766,7 +766,7 @@ void ORTHOGONAL_DIMENSION::updateGeometry()
extStart = VECTOR2I( m_crossBarEnd ); extStart = VECTOR2I( m_crossBarEnd );
extStart -= extension.Resize( m_extensionHeight ); extStart -= extension.Resize( m_extensionHeight );
addShape( new SHAPE_SEGMENT( extStart, extStart + extension.Resize( extensionHeight ) ) ); addShape( SHAPE_SEGMENT( extStart, extStart + extension.Resize( extensionHeight ) ) );
// Update text after calculating crossbar position but before adding crossbar lines // Update text after calculating crossbar position but before adding crossbar lines
updateText(); updateText();

2
pcbnew/class_dimension.h
View File

@ -276,7 +276,7 @@ protected:
virtual void updateText(); virtual void updateText();
template<typename ShapeType> template<typename ShapeType>
void addShape( ShapeType* aShape ); void addShape( const ShapeType& aShape );
/** /**
* Finds the intersection between a given segment and polygon outline * Finds the intersection between a given segment and polygon outline