diff options
| author | Matthew Petroff <matthew@mpetroff.net> | 2013-07-30 01:54:37 +0000 |
|---|---|---|
| committer | Matthew Petroff <matthew@mpetroff.net> | 2013-07-30 01:54:37 +0000 |
| commit | 3dab417176ed1ba5b1301acbd9a1c08e8c546c49 (patch) | |
| tree | 83d01a0cc1356dd914b6690a5dbffd6e840e16af /src/satisfied-guide-cns.cpp | |
| parent | Update unit extraction regular expressions. (diff) | |
| parent | Remove unnecessary variable from the GMarkup-based unit parser (diff) | |
| download | inkscape-3dab417176ed1ba5b1301acbd9a1c08e8c546c49.tar.gz inkscape-3dab417176ed1ba5b1301acbd9a1c08e8c546c49.zip | |
Merge from trunk.
(bzr r12380.1.51)
Diffstat (limited to 'src/satisfied-guide-cns.cpp')
| -rw-r--r-- | src/satisfied-guide-cns.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/satisfied-guide-cns.cpp b/src/satisfied-guide-cns.cpp index 57d4ffce3..588c78ce0 100644 --- a/src/satisfied-guide-cns.cpp +++ b/src/satisfied-guide-cns.cpp @@ -1,8 +1,8 @@ +#include <2geom/coord.h> #include "desktop-handles.h" #include "sp-guide.h" #include "sp-guide-constraint.h" #include "sp-namedview.h" -#include "approx-equal.h" #include "satisfied-guide-cns.h" void satisfied_guide_cns(SPDesktop const &desktop, @@ -13,7 +13,7 @@ void satisfied_guide_cns(SPDesktop const &desktop, for (GSList const *l = nv.guides; l != NULL; l = l->next) { SPGuide &g = *SP_GUIDE(l->data); for (unsigned int i = 0; i < snappoints.size(); ++i) { - if (approx_equal( g.getDistanceFrom(snappoints[i].getPoint()), 0) ) { + if (Geom::are_near(g.getDistanceFrom(snappoints[i].getPoint()), 0, 1e-2)) { cns.push_back(SPGuideConstraint(&g, i)); } } |