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

Fixed warnings.

This commit is contained in:
Maciej Suminski 2015-03-03 12:59:26 +01:00
parent 161b360297
commit a6bd3314e4
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/geometry/seg.cpp
View File

@ -35,7 +35,6 @@ bool SEG::PointCloserThan( const VECTOR2I& aP, int aDist ) const
{ {
VECTOR2I d = B - A; VECTOR2I d = B - A;
ecoord dist_sq = (ecoord) aDist * aDist; ecoord dist_sq = (ecoord) aDist * aDist;
ecoord dist_sq_thr = (ecoord) ( aDist + 1 ) * ( aDist + 1 );
SEG::ecoord l_squared = d.Dot( d ); SEG::ecoord l_squared = d.Dot( d );
SEG::ecoord t = d.Dot( aP - A ); SEG::ecoord t = d.Dot( aP - A );

9
pcbnew/router/pns_diff_pair.cpp
View File

@ -235,7 +235,7 @@ bool PNS_DIFF_PAIR::BuildInitial( PNS_DP_GATEWAY& aEntry, PNS_DP_GATEWAY &aTarge
if( p.Intersects( n ) ) if( p.Intersects( n ) )
return false; return false;
return true; return true;
} }
@ -625,19 +625,20 @@ void PNS_DP_GATEWAYS::BuildGeneric( const VECTOR2I& p0_p, const VECTOR2I& p0_n,
{ {
OPT_VECTOR2I ips[2], m; OPT_VECTOR2I ips[2], m;
m = OPT_VECTOR2I();
ips[0] = d_n[i].IntersectLines( d_p[j] ); ips[0] = d_n[i].IntersectLines( d_p[j] );
ips[1] = st_p[i].IntersectLines( st_n[j] ); ips[1] = st_p[i].IntersectLines( st_n[j] );
if( d_n[i].Collinear( d_p[j] ) ) if( d_n[i].Collinear( d_p[j] ) )
ips [0] = OPT_VECTOR2I(); ips[0] = OPT_VECTOR2I();
if( st_p[i].Collinear( st_p[j] ) ) if( st_p[i].Collinear( st_p[j] ) )
ips [1] = OPT_VECTOR2I(); ips[1] = OPT_VECTOR2I();
// diagonal-diagonal and straight-straight cases - the most typical case if the pads // diagonal-diagonal and straight-straight cases - the most typical case if the pads
// are on the same straight/diagonal line // are on the same straight/diagonal line
for( int k = 0; k < 2; k++ ) for( int k = 0; k < 2; k++ )
{ {
m = ips[k]; m = *ips[k];
if( m && *m != p0_p && *m != p0_n ) if( m && *m != p0_p && *m != p0_n )
{ {
int prio = ( padDist > padToGapThreshold * m_gap ? 10 : 20 ); int prio = ( padDist > padToGapThreshold * m_gap ? 10 : 20 );

2
pcbnew/router/pns_walkaround.cpp
View File

@ -136,7 +136,7 @@ PNS_WALKAROUND::WALKAROUND_STATUS PNS_WALKAROUND::Route( const PNS_LINE& aInitia
PNS_LINE& aWalkPath, bool aOptimize ) PNS_LINE& aWalkPath, bool aOptimize )
{ {
PNS_LINE path_cw( aInitialPath ), path_ccw( aInitialPath ); PNS_LINE path_cw( aInitialPath ), path_ccw( aInitialPath );
WALKAROUND_STATUS s_cw, s_ccw; // = IN_PROGRESS, s_ccw = IN_PROGRESS; WALKAROUND_STATUS s_cw = IN_PROGRESS, s_ccw = IN_PROGRESS;
SHAPE_LINE_CHAIN best_path; SHAPE_LINE_CHAIN best_path;
start( aInitialPath ); start( aInitialPath );