diff options
| author | Johan B. C. Engelen <jbc.engelen@swissonline.ch> | 2008-08-04 20:22:06 +0000 |
|---|---|---|
| committer | johanengelen <johanengelen@users.sourceforge.net> | 2008-08-04 20:22:06 +0000 |
| commit | 1cd114b1103431ff346710f94209e2275bc29f67 (patch) | |
| tree | a7effbf4241dbb84a0178147804c0d53e0595868 /src | |
| parent | Remove some obsolete code (diff) | |
| download | inkscape-1cd114b1103431ff346710f94209e2275bc29f67.tar.gz inkscape-1cd114b1103431ff346710f94209e2275bc29f67.zip | |
NR:: => Geom:: for util dir
(bzr r6559)
Diffstat (limited to 'src')
| -rw-r--r-- | src/util/mathfns.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/util/mathfns.h b/src/util/mathfns.h index 9f22ad11b..20c06145a 100644 --- a/src/util/mathfns.h +++ b/src/util/mathfns.h @@ -12,6 +12,7 @@ #ifndef SEEN_INKSCAPE_UTIL_MATHFNS_H #define SEEN_INKSCAPE_UTIL_MATHFNS_H +#include <2geom/point.h> namespace Inkscape { @@ -21,9 +22,11 @@ namespace Util { * Returns area in triangle given by points; may be negative. */ inline double -triangle_area (NR::Point p1, NR::Point p2, NR::Point p3) +triangle_area (Geom::Point p1, Geom::Point p2, Geom::Point p3) { - return (p1[NR::X]*p2[NR::Y] + p1[NR::Y]*p3[NR::X] + p2[NR::X]*p3[NR::Y] - p2[NR::Y]*p3[NR::X] - p1[NR::Y]*p2[NR::X] - p1[NR::X]*p3[NR::Y]); + using Geom::X; + using Geom::Y; + return (p1[X]*p2[Y] + p1[Y]*p3[X] + p2[X]*p3[Y] - p2[Y]*p3[X] - p1[Y]*p2[X] - p1[X]*p3[Y]); } /** |