Fix minor compil warnings

This commit is contained in:
jean-pierre charras 2024-05-10 18:54:32 +02:00
parent 05ee635420
commit 814e54af9b
4 changed files with 10 additions and 10 deletions

View File

@ -476,7 +476,7 @@ SGVECTOR S3D::CalcTriNorm( const SGPOINT& p1, const SGPOINT& p2, const SGPOINT&
// normal // normal
tri = glm::cross( pts[1] - pts[0], pts[2] - pts[0] ); tri = glm::cross( pts[1] - pts[0], pts[2] - pts[0] );
glm::normalize( tri ); (void)glm::normalize( tri );
return SGVECTOR( tri.x, tri.y, tri.z ); return SGVECTOR( tri.x, tri.y, tri.z );
} }

View File

@ -98,8 +98,8 @@ SCH_SHEET* SCH_IO_CADSTAR_ARCHIVE::LoadSchematicFile( const wxString& aFi
wxCHECK_MSG( libTable, nullptr, "Could not load symbol lib table." ); wxCHECK_MSG( libTable, nullptr, "Could not load symbol lib table." );
wxFileName fn = aSchematic->Prj().GetProjectFullName(); wxFileName prj_fn = aSchematic->Prj().GetProjectFullName();
wxString libName = CADSTAR_SCH_ARCHIVE_LOADER::CreateLibName( fn, nullptr ); wxString libName = CADSTAR_SCH_ARCHIVE_LOADER::CreateLibName( prj_fn, nullptr );
wxFileName libFileName( aSchematic->Prj().GetProjectPath(), libName, wxFileName libFileName( aSchematic->Prj().GetProjectPath(), libName,
FILEEXT::KiCadSymbolLibFileExtension ); FILEEXT::KiCadSymbolLibFileExtension );
@ -117,12 +117,12 @@ SCH_SHEET* SCH_IO_CADSTAR_ARCHIVE::LoadSchematicFile( const wxString& aFi
new SYMBOL_LIB_TABLE_ROW( libName, libTableUri, wxString( "KiCad" ) ) ); new SYMBOL_LIB_TABLE_ROW( libName, libTableUri, wxString( "KiCad" ) ) );
// Save project symbol library table. // Save project symbol library table.
wxFileName fn( aSchematic->Prj().GetProjectPath(), wxFileName libtab_fn( aSchematic->Prj().GetProjectPath(),
SYMBOL_LIB_TABLE::GetSymbolLibTableFileName() ); SYMBOL_LIB_TABLE::GetSymbolLibTableFileName() );
// So output formatter goes out of scope and closes the file before reloading. // So output formatter goes out of scope and closes the file before reloading.
{ {
FILE_OUTPUTFORMATTER formatter( fn.GetFullPath() ); FILE_OUTPUTFORMATTER formatter( libtab_fn.GetFullPath() );
libTable->Format( &formatter, 0 ); libTable->Format( &formatter, 0 );
} }

View File

@ -147,7 +147,7 @@ void SIM_MODEL_RAW_SPICE::AssignSymbolPinNumberToModelPin( const std::string& aM
if( pinIndex > 0 ) if( pinIndex > 0 )
{ {
while( m_modelPins.size() < pinIndex ) while( (int)m_modelPins.size() < pinIndex )
m_modelPins.push_back( { fmt::format( "{}", m_modelPins.size() + 1 ), wxEmptyString } ); m_modelPins.push_back( { fmt::format( "{}", m_modelPins.size() + 1 ), wxEmptyString } );
m_modelPins[ --pinIndex /* convert to 0-based */ ].symbolPinNumber = aSymbolPinNumber; m_modelPins[ --pinIndex /* convert to 0-based */ ].symbolPinNumber = aSymbolPinNumber;

View File

@ -304,12 +304,12 @@ void PANEL_FP_LIB_TABLE::setupGrid( WX_GRID* aGrid )
{ {
PCBNEW_SETTINGS* cfg = Pgm().GetSettingsManager().GetAppSettings<PCBNEW_SETTINGS>(); PCBNEW_SETTINGS* cfg = Pgm().GetSettingsManager().GetAppSettings<PCBNEW_SETTINGS>();
auto autoSizeCol = [&]( WX_GRID* aGrid, int aCol ) auto autoSizeCol = [&]( WX_GRID* aLocGrid, int aCol )
{ {
int prevWidth = aGrid->GetColSize( aCol ); int prevWidth = aLocGrid->GetColSize( aCol );
aGrid->AutoSizeColumn( aCol, false ); aLocGrid->AutoSizeColumn( aCol, false );
aGrid->SetColSize( aCol, std::max( prevWidth, aGrid->GetColSize( aCol ) ) ); aLocGrid->SetColSize( aCol, std::max( prevWidth, aLocGrid->GetColSize( aCol ) ) );
}; };
// Give a bit more room for wxChoice editors // Give a bit more room for wxChoice editors