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

Fix a boost compatibility with old boost versions. 

(replace boost::optional::has_value() by its definition is_initialized())
This commit is contained in:
jean-pierre charras 2021-07-16 14:01:26 +02:00
parent 7ff9806386
commit 25e9d17722
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libs/kimath/src/convert_basic_shapes_to_polygon.cpp
View File

@ -311,7 +311,7 @@ void CornerListToPolygon( SHAPE_POLY_SET& outline, std::vector<ROUNDED_CORNER>&
RotatePoint( pt, -angPos ); RotatePoint( pt, -angPos );
pt += arcCenter; pt += arcCenter;
OPT<VECTOR2I> intersect = inSeg.Intersect( SEG( arcExStart, pt ) ); OPT<VECTOR2I> intersect = inSeg.Intersect( SEG( arcExStart, pt ) );
outline.Append( intersect.has_value() ? intersect.get() : arcStart ); outline.Append( intersect.is_initialized() ? intersect.get() : arcStart );
outline.Append( pt ); outline.Append( pt );
angPos += angDelta; angPos += angDelta;
@ -324,7 +324,7 @@ void CornerListToPolygon( SHAPE_POLY_SET& outline, std::vector<ROUNDED_CORNER>&
} }
intersect = outSeg.Intersect( SEG( pt, arcExEnd ) ); intersect = outSeg.Intersect( SEG( pt, arcExEnd ) );
outline.Append( intersect.has_value() ? intersect.get() : arcEnd ); outline.Append( intersect.is_initialized() ? intersect.get() : arcEnd );
} }
} }
@ -401,14 +401,14 @@ void TransformRoundChamferedRectToPolygon( SHAPE_POLY_SET& aCornerBuffer, const
int chamId[4] = { RECT_CHAMFER_TOP_LEFT, RECT_CHAMFER_TOP_RIGHT, int chamId[4] = { RECT_CHAMFER_TOP_LEFT, RECT_CHAMFER_TOP_RIGHT,
RECT_CHAMFER_BOTTOM_RIGHT, RECT_CHAMFER_BOTTOM_LEFT }; RECT_CHAMFER_BOTTOM_RIGHT, RECT_CHAMFER_BOTTOM_LEFT };
int sign[8] = { 0, 1, -1, 0, 0, -1, 1, 0 }; int sign[8] = { 0, 1, -1, 0, 0, -1, 1, 0 };
for( int cc = 0, pos = 0; cc < 4; cc++, pos++ ) for( int cc = 0, pos = 0; cc < 4; cc++, pos++ )
{ {
if( !( aChamferCorners & chamId[cc] ) ) if( !( aChamferCorners & chamId[cc] ) )
continue; continue;
corners[pos].m_radius = 0; corners[pos].m_radius = 0;
if( chamfer == 0 ) if( chamfer == 0 )
continue; continue;