index d71c6fe0ccf5aaca614fe35581baed9ca6e13be4..792a9d3bf046f2cd47373408eb9afdcf4f2e90b5 100644 (file)
-#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)
if (item.constraints.empty()) {
return;
}
- vector<NR::Point> snappoints;
- sp_item_snappoints(&item, SnapPointsIter(snappoints));
+ std::vector<Inkscape::SnapCandidatePoint> snappoints;
+ sp_item_snappoints(&item, snappoints, NULL);
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, snappoints[snappoint_ix]), cn.g->position)) {
+ if (!approx_equal( sp_guide_distance_from_pt(cn.g, snappoints[snappoint_ix].getPoint()), 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]);