display/inkscape-cairo.h: Supply missing #includes/declarations so that we don't...

[inkscape.git] / src / sp-item-rm-unsatisfied-cns.cpp

diff --git a/src/sp-item-rm-unsatisfied-cns.cpp b/src/sp-item-rm-unsatisfied-cns.cpp
index 1f6a9ebe787a42e675bd53c78218c910e6107d69..bcd16e3aa77167d75fe3977810ce35e005a236c5 100644 (file)
--- a/src/sp-item-rm-unsatisfied-cns.cpp
+++ b/src/sp-item-rm-unsatisfied-cns.cpp
@@ -1,9 +1,12 @@
 
-#include <approx-equal.h>
-#include <remove-last.h>
-#include <sp-guide.h>
-#include <sp-guide-constraint.h>
-#include <sp-item.h>
+#include <algorithm>
+
+#include "approx-equal.h"
+#include "remove-last.h"
+#include "sp-guide.h"
+#include "sp-guide-constraint.h"
+#include "sp-item.h"
+
 using std::vector;
 
 void sp_item_rm_unsatisfied_cns(SPItem &item)
@@ -11,14 +14,14 @@ void sp_item_rm_unsatisfied_cns(SPItem &item)
     if (item.constraints.empty()) {
         return;
     }
-    vector<NR::Point> snappoints;
+    std::vector<NR::Point> snappoints;
     sp_item_snappoints(&item, true, SnapPointsIter(snappoints));
     for (unsigned i = item.constraints.size(); i--;) {
         g_assert( i < item.constraints.size() );
         SPGuideConstraint const &cn = item.constraints[i];
         int const snappoint_ix = cn.snappoint_ix;
         g_assert( snappoint_ix < int(snappoints.size()) );
-        if (!approx_equal(dot(cn.g->normal_to_line, snappoints[snappoint_ix]), cn.g->position)) {
+        if (!approx_equal( sp_guide_distance_from_pt(cn.g, snappoints[snappoint_ix].to_2geom()), 0) ) {
             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]);