From a6bd3314e45d48de7df7740a8d3c79d4d1db4b09 Mon Sep 17 00:00:00 2001 From: Maciej Suminski Date: Tue, 3 Mar 2015 12:59:26 +0100 Subject: [PATCH] Fixed warnings. --- common/geometry/seg.cpp | 1 - pcbnew/router/pns_diff_pair.cpp | 9 +++++---- pcbnew/router/pns_walkaround.cpp | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/common/geometry/seg.cpp b/common/geometry/seg.cpp index ceb279d489..2cf5cf4365 100644 --- a/common/geometry/seg.cpp +++ b/common/geometry/seg.cpp @@ -35,7 +35,6 @@ bool SEG::PointCloserThan( const VECTOR2I& aP, int aDist ) const { VECTOR2I d = B - A; ecoord dist_sq = (ecoord) aDist * aDist; - ecoord dist_sq_thr = (ecoord) ( aDist + 1 ) * ( aDist + 1 ); SEG::ecoord l_squared = d.Dot( d ); SEG::ecoord t = d.Dot( aP - A ); diff --git a/pcbnew/router/pns_diff_pair.cpp b/pcbnew/router/pns_diff_pair.cpp index 271a8f05de..358dd417e9 100644 --- a/pcbnew/router/pns_diff_pair.cpp +++ b/pcbnew/router/pns_diff_pair.cpp @@ -235,7 +235,7 @@ bool PNS_DIFF_PAIR::BuildInitial( PNS_DP_GATEWAY& aEntry, PNS_DP_GATEWAY &aTarge if( p.Intersects( n ) ) return false; - + return true; } @@ -625,19 +625,20 @@ void PNS_DP_GATEWAYS::BuildGeneric( const VECTOR2I& p0_p, const VECTOR2I& p0_n, { OPT_VECTOR2I ips[2], m; + m = OPT_VECTOR2I(); ips[0] = d_n[i].IntersectLines( d_p[j] ); ips[1] = st_p[i].IntersectLines( st_n[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] ) ) - ips [1] = OPT_VECTOR2I(); + ips[1] = OPT_VECTOR2I(); // diagonal-diagonal and straight-straight cases - the most typical case if the pads // are on the same straight/diagonal line for( int k = 0; k < 2; k++ ) { - m = ips[k]; + m = *ips[k]; if( m && *m != p0_p && *m != p0_n ) { int prio = ( padDist > padToGapThreshold * m_gap ? 10 : 20 ); diff --git a/pcbnew/router/pns_walkaround.cpp b/pcbnew/router/pns_walkaround.cpp index da965343ed..b3edf34a9f 100644 --- a/pcbnew/router/pns_walkaround.cpp +++ b/pcbnew/router/pns_walkaround.cpp @@ -136,7 +136,7 @@ PNS_WALKAROUND::WALKAROUND_STATUS PNS_WALKAROUND::Route( const PNS_LINE& aInitia PNS_LINE& aWalkPath, bool aOptimize ) { 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; start( aInitialPath );