diff options
| author | Krzysztof Kosi??ski <tweenk.pl@gmail.com> | 2013-07-23 16:54:03 +0000 |
|---|---|---|
| committer | Krzysztof Kosiński <tweenk.pl@gmail.com> | 2013-07-23 16:54:03 +0000 |
| commit | 379521136cda27b5e42c7afdd87a8ac691404f16 (patch) | |
| tree | f3b79a3e903a907a9187f6d61d79b0e442a742f7 | |
| parent | Fix spelling error in filename (diff) | |
| download | inkscape-379521136cda27b5e42c7afdd87a8ac691404f16.tar.gz inkscape-379521136cda27b5e42c7afdd87a8ac691404f16.zip | |
Remove approx-equal.h and replace with Geom::are_near
(bzr r12431)
| -rw-r--r-- | src/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/Makefile_insert | 2 | ||||
| -rw-r--r-- | src/doxygen-main.cpp | 2 | ||||
| -rw-r--r-- | src/satisfied-guide-cns.cpp | 4 | ||||
| -rw-r--r-- | src/sp-item-rm-unsatisfied-cns.cpp | 5 |
5 files changed, 7 insertions, 7 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 87f223150..02a206787 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -312,7 +312,6 @@ set(inkscape_SRC MultiPrinter.h PylogFormatter.h TRPIFormatter.h - approx-equal.h arc-context.h attributes-test.h attributes.h diff --git a/src/Makefile_insert b/src/Makefile_insert index 88f809b52..3e61f625a 100644 --- a/src/Makefile_insert +++ b/src/Makefile_insert @@ -3,7 +3,7 @@ ink_common_sources += \ util/find-last-if.h \ util/longest-common-suffix.h \ - approx-equal.h remove-last.h \ + remove-last.h \ arc-context.cpp arc-context.h \ attributes.cpp attributes.h \ attribute-rel-svg.cpp attribute-rel-svg.h \ diff --git a/src/doxygen-main.cpp b/src/doxygen-main.cpp index 04e5ab33e..1c3e5dcbb 100644 --- a/src/doxygen-main.cpp +++ b/src/doxygen-main.cpp @@ -350,7 +350,7 @@ namespace XML {} * Inkscape::Whiteboard::UndoStackObserver [\ref undo-stack-observer.cpp, \ref composite-undo-stack-observer.cpp] * [\ref document-undo.cpp] * - * {\ref dialogs/} [\ref approx-equal.h] [\ref decimal-round.h] [\ref enums.h] [\ref unit-constants.h] + * {\ref dialogs/} [\ref decimal-round.h] [\ref enums.h] [\ref unit-constants.h] */ 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)); } } diff --git a/src/sp-item-rm-unsatisfied-cns.cpp b/src/sp-item-rm-unsatisfied-cns.cpp index c35e4fa48..8fb171c08 100644 --- a/src/sp-item-rm-unsatisfied-cns.cpp +++ b/src/sp-item-rm-unsatisfied-cns.cpp @@ -1,7 +1,7 @@ #include <algorithm> +#include <2geom/coord.h> -#include "approx-equal.h" #include "remove-last.h" #include "sp-guide.h" #include "sp-guide-constraint.h" @@ -22,7 +22,8 @@ void sp_item_rm_unsatisfied_cns(SPItem &item) SPGuideConstraint const &cn = item.constraints[i]; int const snappoint_ix = cn.snappoint_ix; g_assert( snappoint_ix < int(snappoints.size()) ); - if (!approx_equal( cn.g->getDistanceFrom(snappoints[snappoint_ix].getPoint()), 0) ) { + + if (!Geom::are_near(cn.g->getDistanceFrom(snappoints[snappoint_ix].getPoint()), 0, 1e-2)) { remove_last(cn.g->attached_items, SPGuideAttachment(&item, cn.snappoint_ix)); g_assert( i < item.constraints.size() ); vector<SPGuideConstraint>::iterator const ei(&item.constraints[i]); |