Commit b6c5b291 authored by Maciej Suminski's avatar Maciej Suminski

Coverity fixes.

parent 8e7bc566
...@@ -55,7 +55,7 @@ GPU_MANAGER* GPU_MANAGER::MakeManager( VERTEX_CONTAINER* aContainer ) ...@@ -55,7 +55,7 @@ GPU_MANAGER* GPU_MANAGER::MakeManager( VERTEX_CONTAINER* aContainer )
GPU_MANAGER::GPU_MANAGER( VERTEX_CONTAINER* aContainer ) : GPU_MANAGER::GPU_MANAGER( VERTEX_CONTAINER* aContainer ) :
m_isDrawing( false ), m_container( aContainer ), m_shader( NULL ) m_isDrawing( false ), m_container( aContainer ), m_shader( NULL ), m_shaderAttrib( 0 )
{ {
} }
...@@ -80,8 +80,8 @@ void GPU_MANAGER::SetShader( SHADER& aShader ) ...@@ -80,8 +80,8 @@ void GPU_MANAGER::SetShader( SHADER& aShader )
// Cached manager // Cached manager
GPU_CACHED_MANAGER::GPU_CACHED_MANAGER( VERTEX_CONTAINER* aContainer ) : GPU_CACHED_MANAGER::GPU_CACHED_MANAGER( VERTEX_CONTAINER* aContainer ) :
GPU_MANAGER( aContainer ), m_buffersInitialized( false ), GPU_MANAGER( aContainer ), m_buffersInitialized( false ), m_indicesPtr( NULL ),
m_indicesSize( 0 ) m_verticesBuffer( 0 ), m_indicesBuffer( 0 ), m_indicesSize( 0 )
{ {
// Allocate the biggest possible buffer for indices // Allocate the biggest possible buffer for indices
m_indices.reset( new GLuint[aContainer->GetSize()] ); m_indices.reset( new GLuint[aContainer->GetSize()] );
......
...@@ -52,7 +52,7 @@ bool SEG::PointCloserThan( const VECTOR2I& aP, int aDist ) const ...@@ -52,7 +52,7 @@ bool SEG::PointCloserThan( const VECTOR2I& aP, int aDist ) const
int cb = sgn( d.x ); int cb = sgn( d.x );
int cc = -ca * A.x - cb * A.y; int cc = -ca * A.x - cb * A.y;
ecoord num = ca * aP.x + cb * aP.y + cc; ecoord num = (ecoord) ca * aP.x + (ecoord) cb * aP.y + cc;
num *= num; num *= num;
if( ca && cb ) if( ca && cb )
......
...@@ -930,11 +930,11 @@ void DIALOG_PAD_PROPERTIES::PadPropertiesAccept( wxCommandEvent& event ) ...@@ -930,11 +930,11 @@ void DIALOG_PAD_PROPERTIES::PadPropertiesAccept( wxCommandEvent& event )
{ {
const NETINFO_ITEM* netinfo = m_board->FindNet( padNetname ); const NETINFO_ITEM* netinfo = m_board->FindNet( padNetname );
if( !padNetname.IsEmpty() && netinfo == NULL ) if( !padNetname.IsEmpty() && netinfo == NULL )
{ {
DisplayError( NULL, _( "Unknown netname, netname not changed" ) ); DisplayError( NULL, _( "Unknown netname, netname not changed" ) );
} }
else else if( netinfo )
{ {
rastnestIsChanged = true; rastnestIsChanged = true;
m_currentPad->SetNetCode( netinfo->GetNet() ); m_currentPad->SetNetCode( netinfo->GetNet() );
......
...@@ -1302,8 +1302,18 @@ void SELECTION_TOOL::generateMenu() ...@@ -1302,8 +1302,18 @@ void SELECTION_TOOL::generateMenu()
// Filter out entries that does not apply to the current selection // Filter out entries that does not apply to the current selection
for( int i = m_menuCopy.GetMenuItemCount() - 1; i >= 0; --i ) for( int i = m_menuCopy.GetMenuItemCount() - 1; i >= 0; --i )
{ {
if( !m_menuConditions[i]( m_selection ) ) try
{ {
if( !m_menuConditions[i]( m_selection ) )
{
wxMenuItem* item = m_menuCopy.FindItemByPosition( i );
m_menuCopy.Destroy( item );
}
}
catch( boost::bad_function_call )
{
// If it is not possible to determine if a menu entry should be
// shown or not - do not let users pick non-existing options
wxMenuItem* item = m_menuCopy.FindItemByPosition( i ); wxMenuItem* item = m_menuCopy.FindItemByPosition( i );
m_menuCopy.Destroy( item ); m_menuCopy.Destroy( item );
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment