Fix a few compil or coverity warnings.
This commit is contained in:
parent
ed66c0f14d
commit
d7616fdca8
|
@ -36,8 +36,8 @@ const int gerbviewSchemaVersion = 0;
|
||||||
|
|
||||||
GERBVIEW_SETTINGS::GERBVIEW_SETTINGS() :
|
GERBVIEW_SETTINGS::GERBVIEW_SETTINGS() :
|
||||||
APP_SETTINGS_BASE( "gerbview", gerbviewSchemaVersion ),
|
APP_SETTINGS_BASE( "gerbview", gerbviewSchemaVersion ),
|
||||||
m_BoardLayersCount( 2 ),
|
m_Appearance(),
|
||||||
m_Appearance()
|
m_BoardLayersCount( 2 )
|
||||||
{
|
{
|
||||||
// Init settings:
|
// Init settings:
|
||||||
m_params.emplace_back( new PARAM<bool>( "appearance.show_border_and_titleblock",
|
m_params.emplace_back( new PARAM<bool>( "appearance.show_border_and_titleblock",
|
||||||
|
|
|
@ -720,6 +720,7 @@ void BOARD_DESIGN_SETTINGS::initFromOther( const BOARD_DESIGN_SETTINGS& aOther )
|
||||||
m_AuxOrigin = aOther.m_AuxOrigin;
|
m_AuxOrigin = aOther.m_AuxOrigin;
|
||||||
m_GridOrigin = aOther.m_GridOrigin;
|
m_GridOrigin = aOther.m_GridOrigin;
|
||||||
m_HasStackup = aOther.m_HasStackup;
|
m_HasStackup = aOther.m_HasStackup;
|
||||||
|
m_UseHeightForLengthCalcs= aOther.m_UseHeightForLengthCalcs;
|
||||||
|
|
||||||
m_trackWidthIndex = aOther.m_trackWidthIndex;
|
m_trackWidthIndex = aOther.m_trackWidthIndex;
|
||||||
m_viaSizeIndex = aOther.m_viaSizeIndex;
|
m_viaSizeIndex = aOther.m_viaSizeIndex;
|
||||||
|
|
|
@ -1027,7 +1027,7 @@ bool PCBMODEL::getModelLabel( const std::string& aFileName, TRIPLET aScale, TDF_
|
||||||
{
|
{
|
||||||
ReportMessage( wxString::Format( "readSTEP() failed on filename %s\n",
|
ReportMessage( wxString::Format( "readSTEP() failed on filename %s\n",
|
||||||
aFileName ) );
|
aFileName ) );
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
{
|
{
|
||||||
|
@ -1074,8 +1074,6 @@ bool PCBMODEL::getModelLabel( const std::string& aFileName, TRIPLET aScale, TDF_
|
||||||
return success;
|
return success;
|
||||||
}
|
}
|
||||||
|
|
||||||
return getModelLabel( outFile.GetFullPath().ToStdString(), aScale, aLabel );
|
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue