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

Opencascade: fix min version: OCE=0.18, OCC=6.9.0 

Fix also a few minor Coverity warnings.
This commit is contained in:
jean-pierre charras 2020-04-16 09:27:22 +02:00
parent 8dcbd1e6d2
commit 25d7c0cae2
4 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -392,7 +392,7 @@ if( CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
# API with respect to the C99 standard, so make sure we force it to use its own compliant # API with respect to the C99 standard, so make sure we force it to use its own compliant
# snprintf # snprintf
add_definitions(-D__USE_MINGW_ANSI_STDIO=1) add_definitions(-D__USE_MINGW_ANSI_STDIO=1)
# Allow linking for Boost for the UUID against bcrypt # Allow linking for Boost for the UUID against bcrypt
set( EXTRA_LIBS "bcrypt" ) set( EXTRA_LIBS "bcrypt" )
@ -682,7 +682,7 @@ endif()
if( KICAD_USE_OCE ) if( KICAD_USE_OCE )
set( OCC_LIBRARIES TKBinXCAF TKPCAF TKSTEP TKXDESTEP TKIGES TKXDEIGES ) set( OCC_LIBRARIES TKBinXCAF TKPCAF TKSTEP TKXDESTEP TKIGES TKXDEIGES )
find_package( OCE 0.16 REQUIRED ${OCC_LIBRARIES} ) find_package( OCE 0.18 REQUIRED ${OCC_LIBRARIES} )
elseif( KICAD_USE_OCC ) elseif( KICAD_USE_OCC )
find_package(OpenCASCADE) find_package(OpenCASCADE)
@ -691,10 +691,10 @@ elseif( KICAD_USE_OCC )
" KICAD_USE_OCC=True but OpenCASCADE was not found!\n" " KICAD_USE_OCC=True but OpenCASCADE was not found!\n"
"================================================================\n") "================================================================\n")
endif() endif()
if( OCC_VERSION_STRING VERSION_LESS 6.8.0 ) if( OCC_VERSION_STRING VERSION_LESS 6.9.0 )
MESSAGE( FATAL_ERROR "================================================================\n" MESSAGE( FATAL_ERROR "================================================================\n"
"OpenCASCADE version ${OCC_VERSION_STRING} was found.\n" "OpenCASCADE version ${OCC_VERSION_STRING} was found.\n"
" KiCad requires a minimum version of 6.8.0\n" " KiCad requires a minimum version of 6.9.0\n"
"================================================================\n") "================================================================\n")
endif() endif()
include_directories( SYSTEM ${OCC_INCLUDE_DIR} ) include_directories( SYSTEM ${OCC_INCLUDE_DIR} )

5
eeschema/sim/sim_plot_frame.cpp
View File

@ -614,6 +614,11 @@ void SIM_PLOT_FRAME::addPlot( const wxString& aName, SIM_PLOT_TYPE aType, const
if( !plotPanel || plotPanel->GetType() != simType ) if( !plotPanel || plotPanel->GetType() != simType )
plotPanel = dynamic_cast<SIM_PLOT_PANEL*>( NewPlotPanel( simType ) ); plotPanel = dynamic_cast<SIM_PLOT_PANEL*>( NewPlotPanel( simType ) );
wxASSERT( plotPanel );
if( !plotPanel ) // Something is wrong
return;
TRACE_DESC descriptor( *m_exporter, aName, aType, aParam ); TRACE_DESC descriptor( *m_exporter, aName, aType, aParam );
bool updated = false; bool updated = false;

5
libs/kimath/src/geometry/shape_line_chain.cpp
View File

@ -1013,8 +1013,9 @@ double SHAPE_LINE_CHAIN::Area() const
} }
SHAPE_LINE_CHAIN::POINT_INSIDE_TRACKER::POINT_INSIDE_TRACKER( const VECTOR2I& aPoint ) : SHAPE_LINE_CHAIN::POINT_INSIDE_TRACKER::POINT_INSIDE_TRACKER( const VECTOR2I& aPoint ) :
m_point( aPoint ), m_point( aPoint ),
m_finished( false ),
m_state( 0 ), m_state( 0 ),
m_count( 0 ) m_count( 0 )
{ {
@ -1095,7 +1096,7 @@ void SHAPE_LINE_CHAIN::POINT_INSIDE_TRACKER::AddPolyline( const SHAPE_LINE_CHAIN
for (int i = 1; i < aPolyline.PointCount(); i++ ) for (int i = 1; i < aPolyline.PointCount(); i++ )
{ {
auto p = aPolyline.CPoint( i ); auto p = aPolyline.CPoint( i );
if( !processVertex( m_lastPoint, p )) if( !processVertex( m_lastPoint, p ))
return; return;
m_lastPoint = p; m_lastPoint = p;

2
utils/kicad2step/kicad2step.cpp
View File

@ -41,6 +41,8 @@ class KICAD2STEP_FRAME;
class KICAD2MCAD_APP : public wxApp class KICAD2MCAD_APP : public wxApp
{ {
public: public:
KICAD2MCAD_APP() : wxApp(), m_frame( nullptr ), m_Panel( nullptr )
{}
virtual bool OnInit() override; virtual bool OnInit() override;
virtual int OnRun() override; virtual int OnRun() override;
virtual void OnInitCmdLine(wxCmdLineParser& parser) override; virtual void OnInitCmdLine(wxCmdLineParser& parser) override;