diff options
| author | Johan B. C. Engelen <jbc.engelen@swissonline.ch> | 2008-12-13 20:15:24 +0000 |
|---|---|---|
| committer | johanengelen <johanengelen@users.sourceforge.net> | 2008-12-13 20:15:24 +0000 |
| commit | f601c30d32a69e35c46708baa542de34af56af6f (patch) | |
| tree | 0a763f81b4f38a2d3c6d18f694d86576688c5e21 /src | |
| parent | add missing files (diff) | |
| download | inkscape-f601c30d32a69e35c46708baa542de34af56af6f.tar.gz inkscape-f601c30d32a69e35c46708baa542de34af56af6f.zip | |
fix compile.
re-enable decrepated 2geom functions.
(bzr r6998)
Diffstat (limited to 'src')
| -rw-r--r-- | src/2geom/geom.h | 2 | ||||
| -rw-r--r-- | src/box3d.cpp | 2 | ||||
| -rw-r--r-- | src/display/canvas-axonomgrid.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/2geom/geom.h b/src/2geom/geom.h index 9233696d7..dc50c1bb8 100644 --- a/src/2geom/geom.h +++ b/src/2geom/geom.h @@ -57,7 +57,7 @@ intersector_ccw(const Geom::Point& p0, const Geom::Point& p1, /* intersectors */ -#if 0 +#if 1 // Use the new routines provided in line.h IntersectorKind diff --git a/src/box3d.cpp b/src/box3d.cpp index 057329a28..a6dd378f1 100644 --- a/src/box3d.cpp +++ b/src/box3d.cpp @@ -32,7 +32,7 @@ #include "line-geometry.h" #include "persp3d-reference.h" #include "uri.h" -#include "2geom/geom.h" +#include <2geom/geom.h> #include "sp-guide.h" #include "sp-namedview.h" #include "preferences.h" diff --git a/src/display/canvas-axonomgrid.cpp b/src/display/canvas-axonomgrid.cpp index e181035eb..a636d8268 100644 --- a/src/display/canvas-axonomgrid.cpp +++ b/src/display/canvas-axonomgrid.cpp @@ -710,7 +710,7 @@ CanvasAxonomGridSnapper::_getSnapLines(Geom::Point const &p) const // The vertical grid line is at the intersection of two angled grid lines. // Now go find that intersection! Geom::Point result; - Geom::IntersectorKind is = line_intersection(norm_x, norm_x[Geom::Y]*y_proj_along_x_max, + Geom::IntersectorKind is = Geom::line_intersection(norm_x, norm_x[Geom::Y]*y_proj_along_x_max, norm_z, norm_z[Geom::Y]*y_proj_along_z_max, result); |