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

Fix a compil issue with gcc12.2 and Coverity warnings.

This commit is contained in:
jean-pierre charras 2023-02-21 11:54:38 +01:00
parent 365c7be4ed
commit b05b33a9ff
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/page_info.cpp
View File

@ -2,7 +2,7 @@
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2012 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>
* Copyright (C) 2012 KiCad Developers, see AUTHORS.TXT for contributors.
* Copyright (C) 2023 KiCad Developers, see AUTHORS.TXT for contributors.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@ -171,7 +171,7 @@ bool PAGE_INFO::SetType( const wxString& aType, bool aIsPortrait )
if( aIsPortrait )
{
// all private PAGE_INFOs are landscape, must swap x and y
m_size = VECTOR2I( m_size.y, m_size.x );
std::swap( m_size.y, m_size.x );
updatePortrait();
}
@ -190,7 +190,7 @@ void PAGE_INFO::SetPortrait( bool aIsPortrait )
if( m_portrait != aIsPortrait )
{
// swap x and y in m_size
m_size = VECTOR2I( m_size.y, m_size.x );
std::swap( m_size.y, m_size.x );
m_portrait = aIsPortrait;

4
eeschema/sim/sim_plot_frame.cpp
View File

@ -278,7 +278,9 @@ class MEASUREMENTS_GRID_TRICKS : public GRID_TRICKS
public:
MEASUREMENTS_GRID_TRICKS( SIM_PLOT_FRAME* aParent, WX_GRID* aGrid ) :
GRID_TRICKS( aGrid ),
m_parent( aParent )
m_parent( aParent ),
m_menuRow( 0 ),
m_menuCol( 0 )
{}
protected:

2
eeschema/tools/simulator_control.cpp
View File

@ -389,7 +389,7 @@ int SIMULATOR_CONTROL::ShowNetlist( const TOOL_EVENT& aEvent )
m_circuitModel->SetSimOptions( m_plotFrame->GetCurrentOptions() );
m_circuitModel->GetNetlist( &formatter, reporter );
NETLIST_VIEW_DIALOG dlg( m_plotFrame, errors.IsEmpty() ? formatter.GetString() : errors );
NETLIST_VIEW_DIALOG dlg( m_plotFrame, errors.IsEmpty() ? wxString( formatter.GetString() ) : errors );
dlg.ShowModal();
return 0;