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

geometry: killed compiler warnings

This commit is contained in:
tomasz.wlostowski@cern.ch 2013-09-18 13:14:13 +02:00
parent d8480e4674
commit 23298886a1
3 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/geometry/shape_line_chain.cpp
View File

@ -439,7 +439,7 @@ SHAPE_LINE_CHAIN& SHAPE_LINE_CHAIN::Simplify()
const VECTOR2I SHAPE_LINE_CHAIN::NearestPoint(const VECTOR2I& aP) const const VECTOR2I SHAPE_LINE_CHAIN::NearestPoint(const VECTOR2I& aP) const
{ {
int min_d = INT_MAX; int min_d = INT_MAX;
int nearest; int nearest = 0;
for ( int i = 0; i < SegmentCount() ; i++ ) for ( int i = 0; i < SegmentCount() ; i++ )
{ {
int d = CSegment(i).Distance(aP); int d = CSegment(i).Distance(aP);

13
include/geometry/seg.h
View File

@ -307,18 +307,7 @@ inline VECTOR2I SEG::LineProject( const VECTOR2I& aP ) const
{ {
// fixme: numerical errors for large integers // fixme: numerical errors for large integers
assert(false); assert(false);
/*const VECTOR2I d = aB - aA; return VECTOR2I(0, 0);
ecoord det = d.Dot(d);
ecoord dxdy = (ecoord) d.x * d.y;
ecoord qx =
( (extended_type) aA.x * d.y * d.y + (extended_type) d.x * d.x * x - dxdy *
(aA.y - y) ) / det;
extended_type qy =
( (extended_type) aA.y * d.x * d.x + (extended_type) d.y * d.y * y - dxdy *
(aA.x - x) ) / det;
return VECTOR2<T> ( (T) qx, (T) qy );*/
} }

5
include/geometry/shape.h
View File

@ -77,7 +77,10 @@ class SHAPE {
* Returns a dynamically allocated copy of the shape * Returns a dynamically allocated copy of the shape
* @retval copy of the shape * @retval copy of the shape
*/ */
virtual SHAPE* Clone() const { assert(false); }; virtual SHAPE* Clone() const {
assert(false);
return NULL;
};
/** /**
* Function Collide() * Function Collide()