Coverity fixes
CIDs: 102571 168696 168701 168704 168706 168708 168710 168713 168716 168717
This commit is contained in:
parent
83cf726cd6
commit
5eb56dd8b0
|
@ -934,10 +934,6 @@ ECONNECT::ECONNECT( wxXmlNode* aConnect )
|
||||||
gate = parseRequiredAttribute<string>( aConnect, "gate" );
|
gate = parseRequiredAttribute<string>( aConnect, "gate" );
|
||||||
pin = parseRequiredAttribute<string>( aConnect, "pin" );
|
pin = parseRequiredAttribute<string>( aConnect, "pin" );
|
||||||
pad = parseRequiredAttribute<string>( aConnect, "pad" );
|
pad = parseRequiredAttribute<string>( aConnect, "pad" );
|
||||||
|
|
||||||
//TODO:
|
|
||||||
//int contactroute;
|
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -69,7 +69,8 @@ OPENGL_GAL::OPENGL_GAL( GAL_DISPLAY_OPTIONS& aDisplayOptions, wxWindow* aParent,
|
||||||
GAL( aDisplayOptions ),
|
GAL( aDisplayOptions ),
|
||||||
wxGLCanvas( aParent, wxID_ANY, (int*) glAttributes, wxDefaultPosition, wxDefaultSize,
|
wxGLCanvas( aParent, wxID_ANY, (int*) glAttributes, wxDefaultPosition, wxDefaultSize,
|
||||||
wxEXPAND, aName ),
|
wxEXPAND, aName ),
|
||||||
mouseListener( aMouseListener ), paintListener( aPaintListener )
|
mouseListener( aMouseListener ), paintListener( aPaintListener ), currentManager( nullptr ),
|
||||||
|
cachedManager( nullptr ), nonCachedManager( nullptr ), overlayManager( nullptr )
|
||||||
{
|
{
|
||||||
if( glMainContext == NULL )
|
if( glMainContext == NULL )
|
||||||
{
|
{
|
||||||
|
@ -1537,6 +1538,7 @@ int OPENGL_GAL::drawBitmapChar( unsigned long aChar )
|
||||||
const float TEX_Y = font_image.height;
|
const float TEX_Y = font_image.height;
|
||||||
|
|
||||||
const FONT_GLYPH_TYPE* glyph = LookupGlyph(aChar);
|
const FONT_GLYPH_TYPE* glyph = LookupGlyph(aChar);
|
||||||
|
wxASSERT( glyph );
|
||||||
|
|
||||||
if( !glyph ) return 0;
|
if( !glyph ) return 0;
|
||||||
|
|
||||||
|
@ -1592,6 +1594,11 @@ void OPENGL_GAL::drawBitmapOverbar( double aLength, double aHeight )
|
||||||
{
|
{
|
||||||
// To draw an overbar, simply draw an overbar
|
// To draw an overbar, simply draw an overbar
|
||||||
const FONT_GLYPH_TYPE* glyph = LookupGlyph( '_' );
|
const FONT_GLYPH_TYPE* glyph = LookupGlyph( '_' );
|
||||||
|
wxASSERT( glyph );
|
||||||
|
|
||||||
|
if( !glyph )
|
||||||
|
return;
|
||||||
|
|
||||||
const float H = glyph->maxy - glyph->miny;
|
const float H = glyph->maxy - glyph->miny;
|
||||||
|
|
||||||
Save();
|
Save();
|
||||||
|
@ -1642,6 +1649,7 @@ std::pair<VECTOR2D, float> OPENGL_GAL::computeBitmapTextSize( const wxString& aT
|
||||||
unsigned int c = aText[i];
|
unsigned int c = aText[i];
|
||||||
|
|
||||||
const FONT_GLYPH_TYPE* glyph = LookupGlyph( c );
|
const FONT_GLYPH_TYPE* glyph = LookupGlyph( c );
|
||||||
|
wxASSERT( glyph );
|
||||||
|
|
||||||
// a few chars
|
// a few chars
|
||||||
if( !glyph || // Not coded in font
|
if( !glyph || // Not coded in font
|
||||||
|
|
|
@ -30,16 +30,17 @@
|
||||||
|
|
||||||
WIDGET_NET_SELECTOR::WIDGET_NET_SELECTOR (wxWindow *parent, wxWindowID id, const wxString &value, const wxPoint &pos, const wxSize &size,
|
WIDGET_NET_SELECTOR::WIDGET_NET_SELECTOR (wxWindow *parent, wxWindowID id, const wxString &value, const wxPoint &pos, const wxSize &size,
|
||||||
int n, const wxString choices[], long style, const wxValidator &validator, const wxString &name ) :
|
int n, const wxString choices[], long style, const wxValidator &validator, const wxString &name ) :
|
||||||
wxComboBox ( parent, id, value, pos, size, n, choices, style, validator, name )
|
wxComboBox( parent, id, value, pos, size, n, choices, style, validator, name ),
|
||||||
|
m_multiple( false )
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
WIDGET_NET_SELECTOR::~WIDGET_NET_SELECTOR()
|
WIDGET_NET_SELECTOR::~WIDGET_NET_SELECTOR()
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void WIDGET_NET_SELECTOR::SetMultiple( bool aMultiple )
|
void WIDGET_NET_SELECTOR::SetMultiple( bool aMultiple )
|
||||||
{
|
{
|
||||||
if ( aMultiple )
|
if ( aMultiple )
|
||||||
|
@ -51,6 +52,7 @@ void WIDGET_NET_SELECTOR::SetMultiple( bool aMultiple )
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void WIDGET_NET_SELECTOR::SetSelectedNet ( int aNetcode )
|
void WIDGET_NET_SELECTOR::SetSelectedNet ( int aNetcode )
|
||||||
{
|
{
|
||||||
for( const auto& n : m_nets )
|
for( const auto& n : m_nets )
|
||||||
|
@ -63,9 +65,11 @@ void WIDGET_NET_SELECTOR::SetSelectedNet ( int aNetcode )
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
int WIDGET_NET_SELECTOR::GetSelectedNet()
|
int WIDGET_NET_SELECTOR::GetSelectedNet()
|
||||||
{
|
{
|
||||||
int pos = GetSelection();
|
int pos = GetSelection();
|
||||||
|
|
||||||
for( const auto& n : m_nets )
|
for( const auto& n : m_nets )
|
||||||
{
|
{
|
||||||
if( n.pos == pos )
|
if( n.pos == pos )
|
||||||
|
@ -75,6 +79,7 @@ int WIDGET_NET_SELECTOR::GetSelectedNet()
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
bool WIDGET_NET_SELECTOR::IsUniqueNetSelected() const
|
bool WIDGET_NET_SELECTOR::IsUniqueNetSelected() const
|
||||||
{
|
{
|
||||||
if( m_multiple && ( GetSelection() == ( (int)GetCount() - 1 ) ) )
|
if( m_multiple && ( GetSelection() == ( (int)GetCount() - 1 ) ) )
|
||||||
|
@ -83,6 +88,7 @@ bool WIDGET_NET_SELECTOR::IsUniqueNetSelected() const
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void WIDGET_NET_SELECTOR::SetBoard( BOARD* aBoard )
|
void WIDGET_NET_SELECTOR::SetBoard( BOARD* aBoard )
|
||||||
{
|
{
|
||||||
auto& netinfo = aBoard->GetNetInfo();
|
auto& netinfo = aBoard->GetNetInfo();
|
||||||
|
|
|
@ -82,7 +82,13 @@ bool WX_UNIT_BINDER::Valid() const
|
||||||
void WX_UNIT_BINDER::Enable( bool aEnable )
|
void WX_UNIT_BINDER::Enable( bool aEnable )
|
||||||
{
|
{
|
||||||
wxWindow* wxWin = dynamic_cast<wxWindow*>( m_textEntry );
|
wxWindow* wxWin = dynamic_cast<wxWindow*>( m_textEntry );
|
||||||
|
wxASSERT( wxWin );
|
||||||
|
|
||||||
|
// Most text input entry widgets inherit from wxTextEntry and wxWindow, so it should be fine.
|
||||||
|
// Still, it is better to be safe than sorry.
|
||||||
|
if( wxWin )
|
||||||
wxWin->Enable( aEnable );
|
wxWin->Enable( aEnable );
|
||||||
|
|
||||||
m_unitLabel->Enable( aEnable );
|
m_unitLabel->Enable( aEnable );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -278,7 +278,10 @@ static void eagleToKicadAlignment( EDA_TEXT* aText, int aEagleAlignment,
|
||||||
|
|
||||||
SCH_EAGLE_PLUGIN::SCH_EAGLE_PLUGIN()
|
SCH_EAGLE_PLUGIN::SCH_EAGLE_PLUGIN()
|
||||||
{
|
{
|
||||||
|
m_kiway = nullptr;
|
||||||
m_rootSheet = nullptr;
|
m_rootSheet = nullptr;
|
||||||
|
m_currentSheet = nullptr;
|
||||||
|
m_partlib = nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -480,7 +483,6 @@ void SCH_EAGLE_PLUGIN::loadSchematic( wxXmlNode* aSchematicNode )
|
||||||
int sheet_count = countChildren( schematicChildren["sheets"], "sheet" );
|
int sheet_count = countChildren( schematicChildren["sheets"], "sheet" );
|
||||||
|
|
||||||
// If eagle schematic has multiple sheets.
|
// If eagle schematic has multiple sheets.
|
||||||
|
|
||||||
if( sheet_count > 1 )
|
if( sheet_count > 1 )
|
||||||
{
|
{
|
||||||
int x, y, i;
|
int x, y, i;
|
||||||
|
@ -497,17 +499,16 @@ void SCH_EAGLE_PLUGIN::loadSchematic( wxXmlNode* aSchematicNode )
|
||||||
sheet->SetTimeStamp( GetNewTimeStamp() - i ); // minus the sheet index to make it unique.
|
sheet->SetTimeStamp( GetNewTimeStamp() - i ); // minus the sheet index to make it unique.
|
||||||
sheet->SetParent( m_rootSheet->GetScreen() );
|
sheet->SetParent( m_rootSheet->GetScreen() );
|
||||||
sheet->SetScreen( screen );
|
sheet->SetScreen( screen );
|
||||||
|
sheet->GetScreen()->SetFileName( sheet->GetFileName() );
|
||||||
|
|
||||||
m_currentSheet = sheet.get();
|
m_currentSheet = sheet.get();
|
||||||
sheet->GetScreen()->SetFileName( sheet->GetFileName() );
|
|
||||||
m_rootSheet->GetScreen()->Append( sheet.release() );
|
|
||||||
loadSheet( sheetNode, i );
|
loadSheet( sheetNode, i );
|
||||||
|
m_rootSheet->GetScreen()->Append( sheet.release() );
|
||||||
|
|
||||||
sheetNode = sheetNode->GetNext();
|
sheetNode = sheetNode->GetNext();
|
||||||
x += 2;
|
x += 2;
|
||||||
|
|
||||||
if( x > 10 )
|
if( x > 10 ) // start next row
|
||||||
{
|
{
|
||||||
x = 1;
|
x = 1;
|
||||||
y += 2;
|
y += 2;
|
||||||
|
|
|
@ -128,7 +128,7 @@ double AM_PARAM::GetValue( const D_CODE* aDcode ) const
|
||||||
|
|
||||||
default:
|
default:
|
||||||
wxLogDebug( "AM_PARAM::GetValue(): dcode %d prm %d/%d: unexpected type %d",
|
wxLogDebug( "AM_PARAM::GetValue(): dcode %d prm %d/%d: unexpected type %d",
|
||||||
aDcode->m_Num_Dcode, ii, m_paramStack.size(), item.GetType() );
|
aDcode ? aDcode->m_Num_Dcode : -1, ii, m_paramStack.size(), item.GetType() );
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -981,7 +981,7 @@ struct ECONNECT
|
||||||
string gate;
|
string gate;
|
||||||
string pin;
|
string pin;
|
||||||
string pad;
|
string pad;
|
||||||
int contactroute;
|
//int contactroute; // TODO
|
||||||
|
|
||||||
ECONNECT( wxXmlNode* aConnect );
|
ECONNECT( wxXmlNode* aConnect );
|
||||||
};
|
};
|
||||||
|
|
|
@ -69,6 +69,11 @@ void TEXTE_PCB::SetTextAngle( double aAngle )
|
||||||
void TEXTE_PCB::Draw( EDA_DRAW_PANEL* panel, wxDC* DC,
|
void TEXTE_PCB::Draw( EDA_DRAW_PANEL* panel, wxDC* DC,
|
||||||
GR_DRAWMODE DrawMode, const wxPoint& offset )
|
GR_DRAWMODE DrawMode, const wxPoint& offset )
|
||||||
{
|
{
|
||||||
|
wxASSERT( panel );
|
||||||
|
|
||||||
|
if( !panel )
|
||||||
|
return;
|
||||||
|
|
||||||
BOARD* brd = GetBoard();
|
BOARD* brd = GetBoard();
|
||||||
|
|
||||||
if( brd->IsLayerVisible( m_Layer ) == false )
|
if( brd->IsLayerVisible( m_Layer ) == false )
|
||||||
|
@ -78,8 +83,7 @@ void TEXTE_PCB::Draw( EDA_DRAW_PANEL* panel, wxDC* DC,
|
||||||
auto color = frame->Settings().Colors().GetLayerColor( m_Layer );
|
auto color = frame->Settings().Colors().GetLayerColor( m_Layer );
|
||||||
|
|
||||||
EDA_DRAW_MODE_T fillmode = FILLED;
|
EDA_DRAW_MODE_T fillmode = FILLED;
|
||||||
DISPLAY_OPTIONS* displ_opts =
|
DISPLAY_OPTIONS* displ_opts = (DISPLAY_OPTIONS*)panel->GetDisplayOptions();
|
||||||
panel ? (DISPLAY_OPTIONS*)panel->GetDisplayOptions() : NULL;
|
|
||||||
|
|
||||||
if( displ_opts && displ_opts->m_DisplayDrawItemsFill == SKETCH )
|
if( displ_opts && displ_opts->m_DisplayDrawItemsFill == SKETCH )
|
||||||
fillmode = SKETCH;
|
fillmode = SKETCH;
|
||||||
|
|
|
@ -41,7 +41,10 @@ CLIPBOARD_IO::CLIPBOARD_IO():
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
CLIPBOARD_IO::~CLIPBOARD_IO(){}
|
CLIPBOARD_IO::~CLIPBOARD_IO()
|
||||||
|
{
|
||||||
|
delete m_parser;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
STRING_FORMATTER* CLIPBOARD_IO::GetFormatter()
|
STRING_FORMATTER* CLIPBOARD_IO::GetFormatter()
|
||||||
|
@ -303,6 +306,7 @@ BOARD* CLIPBOARD_IO::Load( const wxString& aFileName,
|
||||||
{
|
{
|
||||||
board = dynamic_cast<BOARD*>( item );
|
board = dynamic_cast<BOARD*>( item );
|
||||||
}
|
}
|
||||||
|
|
||||||
// Give the filename to the board if it's new
|
// Give the filename to the board if it's new
|
||||||
if( !aAppendToMe )
|
if( !aAppendToMe )
|
||||||
board->SetFileName( aFileName );
|
board->SetFileName( aFileName );
|
||||||
|
|
|
@ -37,6 +37,7 @@ DRAGGER::DRAGGER( ROUTER* aRouter ) :
|
||||||
m_dragStatus = false;
|
m_dragStatus = false;
|
||||||
m_currentMode = RM_MarkObstacles;
|
m_currentMode = RM_MarkObstacles;
|
||||||
m_initialVia = NULL;
|
m_initialVia = NULL;
|
||||||
|
m_freeAngleMode = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue