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

Fix minor compil warnings (shadowed vars)

This commit is contained in:
jean-pierre charras 2020-10-13 17:35:38 +02:00
parent a7173e8ab0
commit 0cf57c7b1f
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pcbnew/tools/pad_tool.cpp
View File

@ -294,9 +294,9 @@ int PAD_TOOL::EnumeratePads( const TOOL_EVENT& aEvent )
statusPopup.Popup(); statusPopup.Popup();
statusPopup.Move( wxGetMousePosition() + wxPoint( 20, 20 ) ); statusPopup.Move( wxGetMousePosition() + wxPoint( 20, 20 ) );
auto setCursor = auto setCursor =
[&]() [&]()
{ {
frame()->GetCanvas()->SetCurrentCursor( KICURSOR::BULLSEYE ); frame()->GetCanvas()->SetCurrentCursor( KICURSOR::BULLSEYE );
}; };
@ -670,7 +670,6 @@ void PAD_TOOL::recombinePad( D_PAD* aPad )
// Create a new minimally-sized circular anchor and convert existing pad // Create a new minimally-sized circular anchor and convert existing pad
// to a polygon primitive // to a polygon primitive
SHAPE_POLY_SET existingOutline; SHAPE_POLY_SET existingOutline;
int maxError = board()->GetDesignSettings().m_MaxError;
aPad->TransformShapeWithClearanceToPolygon( existingOutline, layer, 0, maxError, aPad->TransformShapeWithClearanceToPolygon( existingOutline, layer, 0, maxError,
ERROR_INSIDE ); ERROR_INSIDE );

4
pcbnew/zone_filler.cpp
View File

@ -723,9 +723,9 @@ void ZONE_FILLER::buildCopperItemClearances( const ZONE_CONTAINER* aZone, PCB_LA
auto evalRulesForItems = auto evalRulesForItems =
[&]( DRC_CONSTRAINT_TYPE_T aConstraint, const BOARD_ITEM* a, const BOARD_ITEM* b, [&]( DRC_CONSTRAINT_TYPE_T aConstraint, const BOARD_ITEM* a, const BOARD_ITEM* b,
PCB_LAYER_ID aLayer ) -> int PCB_LAYER_ID aCtLayer ) -> int
{ {
DRC_CONSTRAINT c = bds.m_DRCEngine->EvalRulesForItems( aConstraint, a, b, aLayer ); DRC_CONSTRAINT c = bds.m_DRCEngine->EvalRulesForItems( aConstraint, a, b, aCtLayer );
return c.Value().HasMin() ? c.Value().Min() : 0; return c.Value().HasMin() ? c.Value().Min() : 0;
}; };