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

Fix a few Coverity warnings.

This commit is contained in:
jean-pierre charras 2020-02-02 08:55:24 +01:00
parent 0e51ed32f9
commit 79e7a27492
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/gal/opengl/opengl_gal.cpp
View File

@ -1806,6 +1806,10 @@ int OPENGL_GAL::drawBitmapChar( unsigned long aChar )
{ {
const FONT_GLYPH_TYPE* g = LookupGlyph( 'x' ); const FONT_GLYPH_TYPE* g = LookupGlyph( 'x' );
wxASSERT( g ); wxASSERT( g );
if( !g ) // Should not happen.
return 0;
Translate( VECTOR2D( g->advance, 0 ) ); Translate( VECTOR2D( g->advance, 0 ) );
return g->advance; return g->advance;
} }

24
thirdparty/clipper/clipper.cpp vendored
View File

@ -201,7 +201,8 @@ int PolyTree::Total() const
// PolyNode methods ... // PolyNode methods ...
// ------------------------------------------------------------------------------ // ------------------------------------------------------------------------------
PolyNode::PolyNode() : Parent( 0 ), Index( 0 ), m_IsOpen( false ) PolyNode::PolyNode() : Parent( 0 ), Index( 0 ), m_IsOpen( false ),
m_jointype( jtSquare ), m_endtype( etClosedPolygon )
{ {
} }
@ -1131,6 +1132,11 @@ ClipperBase::ClipperBase() // constructor
{ {
m_CurrentLM = m_MinimaList.begin(); // begin() == end() here m_CurrentLM = m_MinimaList.begin(); // begin() == end() here
m_UseFullRange = false; m_UseFullRange = false;
// Avoid uninitialized vars:
m_PreserveCollinear = false;
m_HasOpenPaths = false;
m_ActiveEdges = nullptr;
} }
@ -1950,6 +1956,13 @@ Clipper::Clipper( int initOptions ) : ClipperBase() // constructor
m_StrictSimple = ( (initOptions & ioStrictlySimple) != 0 ); m_StrictSimple = ( (initOptions & ioStrictlySimple) != 0 );
m_PreserveCollinear = ( (initOptions & ioPreserveCollinear) != 0 ); m_PreserveCollinear = ( (initOptions & ioPreserveCollinear) != 0 );
m_HasOpenPaths = false; m_HasOpenPaths = false;
// Avoid uninitialized vars
m_ClipType = ctIntersection;
m_SortedEdges = nullptr;
m_ClipFillType = pftEvenOdd;
m_SubjFillType = pftEvenOdd;
m_UsingPolyTree = false;
#ifdef use_xyz #ifdef use_xyz
m_ZFill = 0; m_ZFill = 0;
#endif #endif
@ -4902,6 +4915,15 @@ ClipperOffset::ClipperOffset( double miterLimit, double arcTolerance )
this->MiterLimit = miterLimit; this->MiterLimit = miterLimit;
this->ArcTolerance = arcTolerance; this->ArcTolerance = arcTolerance;
m_lowest.X = -1; m_lowest.X = -1;
//Avoid uninitialized vars:
MiterFallback = jtSquare;
m_delta = 1.0;
m_sinA = 0.0;
m_sin = 0.0;
m_cos = 0.0;
m_miterLim = 1.0;
m_StepsPerRad = 1.0;
} }