diff options
| author | Markus Engel <markus.engel@tum.de> | 2013-07-25 19:06:28 +0000 |
|---|---|---|
| committer | Markus Engel <markus.engel@tum.de> | 2013-07-25 19:06:28 +0000 |
| commit | 73e263588ca2ca99ea7cac8bbf274695dcd0bec6 (patch) | |
| tree | 75a0b4cbc426c1c21671ee784c0230b09ffd4fc4 /src/satisfied-guide-cns.cpp | |
| parent | Merged from trunk (r12419). (diff) | |
| parent | Remove unnecessary variable from the GMarkup-based unit parser (diff) | |
| download | inkscape-73e263588ca2ca99ea7cac8bbf274695dcd0bec6.tar.gz inkscape-73e263588ca2ca99ea7cac8bbf274695dcd0bec6.zip | |
Merge from trunk (r12439).
(bzr r11608.1.108)
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)); } } |