diff options
| author | Johan B. C. Engelen <jbc.engelen@swissonline.ch> | 2007-11-12 19:47:07 +0000 |
|---|---|---|
| committer | johanengelen <johanengelen@users.sourceforge.net> | 2007-11-12 19:47:07 +0000 |
| commit | bd91c05befcd0db146a9f8ae604e6b7a2efdbe78 (patch) | |
| tree | 23e7c6c7a1deb478f032b54dafc0609a47c5724c /src/2geom/point.h | |
| parent | LPE: no longer overload doEffect methods, but name them according to accepted... (diff) | |
| download | inkscape-bd91c05befcd0db146a9f8ae604e6b7a2efdbe78.tar.gz inkscape-bd91c05befcd0db146a9f8ae604e6b7a2efdbe78.zip | |
update to 2geom rev. 1168
(bzr r4068)
Diffstat (limited to 'src/2geom/point.h')
| -rw-r--r-- | src/2geom/point.h | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/src/2geom/point.h b/src/2geom/point.h index bf7dc444f..91df159ca 100644 --- a/src/2geom/point.h +++ b/src/2geom/point.h @@ -174,22 +174,11 @@ extern double atan2(Point const p); /** compute the angle turning from a to b (signed). */ extern double angle_between(Point const a, Point const b); - -#ifdef near -#define lib2geom_near_save near -#undef near -#endif - //IMPL: NearConcept -inline bool near(Point const &a, Point const &b, double const eps=EPSILON) { - return ( near(a[X],b[X],eps) && near(a[Y],b[Y],eps) ); +inline bool are_near(Point const &a, Point const &b, double const eps=EPSILON) { + return ( are_near(a[X],b[X],eps) && are_near(a[Y],b[Y],eps) ); } -#ifdef lib2geom_near_save -#define near lib2geom_near_save -#undef lib2geom_near_save -#endif - /** Returns p * Geom::rotate_degrees(90), but more efficient. * * Angle direction in Inkscape code: If you use the traditional mathematics convention that y |