diff options
| author | Johan B. C. Engelen <jbc.engelen@swissonline.ch> | 2008-08-03 18:45:24 +0000 |
|---|---|---|
| committer | johanengelen <johanengelen@users.sourceforge.net> | 2008-08-03 18:45:24 +0000 |
| commit | 9e7e3bc54debf9d887842ba9b86834830629df82 (patch) | |
| tree | feacc2502555d21562e989be06f02d5271a01174 /src/2geom/path.cpp | |
| parent | convert path to linears and cubics only before creating outline. (workaround ... (diff) | |
| download | inkscape-9e7e3bc54debf9d887842ba9b86834830629df82.tar.gz inkscape-9e7e3bc54debf9d887842ba9b86834830629df82.zip | |
update 2geom
(bzr r6549)
Diffstat (limited to 'src/2geom/path.cpp')
| -rw-r--r-- | src/2geom/path.cpp | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/src/2geom/path.cpp b/src/2geom/path.cpp index 5f321d517..2943d6a92 100644 --- a/src/2geom/path.cpp +++ b/src/2geom/path.cpp @@ -4,7 +4,7 @@ * Authors: * MenTaLguY <mental@rydia.net> * Marco Cecchetti <mrcekets at gmail.com> - * + * * Copyright 2007-2008 authors * * This library is free software; you can redistribute it and/or @@ -35,10 +35,12 @@ #include <2geom/path.h> +#include <algorithm> + using namespace Geom::PathInternal; -namespace Geom +namespace Geom { Rect Path::boundsFast() const { @@ -98,7 +100,7 @@ Path &Path::operator*=(Matrix const &m) { return *this; } -std::vector<double> +std::vector<double> Path::allNearestPoints(Point const& _point, double from, double to) const { if ( from > to ) std::swap(from, to); @@ -125,7 +127,7 @@ Path::allNearestPoints(Point const& _point, double from, double to) const } if ( si == ei ) { - std::vector<double> all_nearest = + std::vector<double> all_nearest = _path[si].allNearestPoints(_point, st, et); for ( unsigned int i = 0; i < all_nearest.size(); ++i ) { @@ -139,7 +141,7 @@ Path::allNearestPoints(Point const& _point, double from, double to) const std::vector<unsigned int> ni; ni.push_back(si); double dsq; - double mindistsq + double mindistsq = distanceSq( _point, _path[si].pointAt( all_np.front().front() ) ); Rect bb; for ( unsigned int i = si + 1; i < ei; ++i ) @@ -191,7 +193,9 @@ Path::allNearestPoints(Point const& _point, double from, double to) const all_nearest.push_back( ni[i] + all_np[i][j] ); } } - return all_nearest; + all_nearest.erase(std::unique(all_nearest.begin(), all_nearest.end()), + all_nearest.end()); + return all_nearest; } double Path::nearestPoint(Point const &_point, double from, double to, double *distance_squared) const @@ -221,7 +225,8 @@ double Path::nearestPoint(Point const &_point, double from, double to, double *d if ( si == ei ) { double nearest = _path[si].nearestPoint(_point, st, et); - *distance_squared = distanceSq(_point, _path[si].pointAt(nearest)); + if (distance_squared != NULL) + *distance_squared = distanceSq(_point, _path[si].pointAt(nearest)); return si + nearest; } @@ -259,9 +264,9 @@ double Path::nearestPoint(Point const &_point, double from, double to, double *d } } - if (distance_squared) { + if (distance_squared != NULL) *distance_squared = mindistsq; - } + return ni + nearest; } |