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

Fix a compil issue on Windows (W7 32bits). Could be an obscure conflict in var/keyword names.

This commit is contained in:
jean-pierre charras 2017-05-10 13:34:51 +02:00
parent b71fc5564a
commit 5ad1a13096
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/base_struct.cpp
View File

@ -2,7 +2,7 @@
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2015 Jean-Pierre Charras, jaen-pierre.charras@gipsa-lab.inpg.com
* Copyright (C) 1992-2015 KiCad Developers, see AUTHORS.txt for contributors.
* Copyright (C) 1992-2017 KiCad Developers, see AUTHORS.txt for contributors.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@ -589,10 +589,10 @@ bool EDA_RECT::IntersectsCircleEdge( const wxPoint& aCenter, const int aRadius,
return false;
}
wxPoint far = FarthestPointTo( aCenter );
wxPoint farpt = FarthestPointTo( aCenter );
// Farthest point must be further than the inside of the line
double fx = (double) far.x;
double fy = (double) far.y;
double fx = (double) farpt.x;
double fy = (double) farpt.y;
double r = (double) aRadius - (double) aWidth / 2;