diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2016-03-15 21:57:03 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2016-03-15 21:57:03 +0000 |
| commit | 6bd1c2a30b66e15fe055b22bd47dadb771f7fae2 (patch) | |
| tree | 1b991cc2736f84fb069666802d485bd29cff6394 /src/guide-snapper.cpp | |
| parent | Update to limit options to radius = 0, radious > 0 or both (diff) | |
| parent | fix-bug-1557192. paint-order crash with multiple items (diff) | |
| download | inkscape-6bd1c2a30b66e15fe055b22bd47dadb771f7fae2.tar.gz inkscape-6bd1c2a30b66e15fe055b22bd47dadb771f7fae2.zip | |
Update to trunk
(bzr r13645.1.119)
Diffstat (limited to 'src/guide-snapper.cpp')
| -rw-r--r-- | src/guide-snapper.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/guide-snapper.cpp b/src/guide-snapper.cpp index 960caed67..17f2d9583 100644 --- a/src/guide-snapper.cpp +++ b/src/guide-snapper.cpp @@ -44,11 +44,10 @@ Inkscape::GuideSnapper::LineList Inkscape::GuideSnapper::_getSnapLines(Geom::Poi } SPGuide const *guide_to_ignore = _snapmanager->getGuideToIgnore(); - - for (GSList const *l = _snapmanager->getNamedView()->guides; l != NULL; l = l->next) { - SPGuide const *g = SP_GUIDE(l->data); - if (g != guide_to_ignore) { - s.push_back(std::pair<Geom::Point, Geom::Point>(g->getNormal(), g->getPoint())); + std::vector<SPGuide *> guides = _snapmanager->getNamedView()->guides; + for(std::vector<SPGuide *>::const_iterator it = guides.begin() ; it != guides.end(); ++it) { + if ((*it) != guide_to_ignore) { + s.push_back(std::pair<Geom::Point, Geom::Point>((*it)->getNormal(), (*it)->getPoint())); } } |