diff options
| author | Andrew Higginson <at.higginson@gmail.com> | 2011-12-27 21:04:47 +0000 |
|---|---|---|
| committer | Andrew <at.higginson@gmail.com> | 2011-12-27 21:04:47 +0000 |
| commit | 80960b623a99aae1402ab651b2974ef544ed3b03 (patch) | |
| tree | ba49d42c2789e9e11f805e2d5263e10f9fedeef8 /src/livarot/PathSimplify.cpp | |
| parent | try to fix bug (diff) | |
| parent | GDL: Cherry-pick upstream patch 73852 (2011-03-23) - Add missing return value. (diff) | |
| download | inkscape-80960b623a99aae1402ab651b2974ef544ed3b03.tar.gz inkscape-80960b623a99aae1402ab651b2974ef544ed3b03.zip | |
merged with trunk so I can build again...
(bzr r10092.1.36)
Diffstat (limited to 'src/livarot/PathSimplify.cpp')
| -rw-r--r-- | src/livarot/PathSimplify.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/livarot/PathSimplify.cpp b/src/livarot/PathSimplify.cpp index 7b04f028a..d6e916197 100644 --- a/src/livarot/PathSimplify.cpp +++ b/src/livarot/PathSimplify.cpp @@ -6,8 +6,8 @@ * */ -#include <glib/gmem.h> -#include <libnr/nr-point-matrix-ops.h> +#include <glib.h> +#include <2geom/affine.h> #include "livarot/Path.h" #include "livarot/path-description.h" @@ -127,7 +127,7 @@ double DistanceToCubic(Geom::Point const &start, PathDescrCubicTo res, Geom::Poi } Geom::Point seg = res.p - start; - nnle = NR::cross(seg, sp); + nnle = Geom::cross(seg, sp); nnle *= nnle; nnle /= Geom::dot(seg, seg); if ( nnle < nle ) { |