summaryrefslogtreecommitdiffstats
path: root/src/sp-conn-end.cpp
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2015-05-09 18:34:01 +0000
committerJabiertxof <jtx@jtx.marker.es>2015-05-09 18:34:01 +0000
commit36bc16fc9772ce0271eb5ec62e2c03cb1038282e (patch)
treec13d992c952bd21bc00c393d80bfe31c3b35284e /src/sp-conn-end.cpp
parentprevent overflow index on a pathinfo function (diff)
parentFix Doxyfile (diff)
downloadinkscape-36bc16fc9772ce0271eb5ec62e2c03cb1038282e.tar.gz
inkscape-36bc16fc9772ce0271eb5ec62e2c03cb1038282e.zip
update to trunk
(bzr r13645.1.85)
Diffstat (limited to 'src/sp-conn-end.cpp')
-rw-r--r--src/sp-conn-end.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/sp-conn-end.cpp b/src/sp-conn-end.cpp
index 3e5398ced..1e478d1c9 100644
--- a/src/sp-conn-end.cpp
+++ b/src/sp-conn-end.cpp
@@ -50,8 +50,9 @@ static bool try_get_intersect_point_with_item_recursive(Geom::PathVector& conn_p
// consider all first-order children
double child_pos = 0.0;
- for (GSList const* i = sp_item_group_item_list(group); i != NULL; i = i->next) {
- SPItem* child_item = SP_ITEM(i->data);
+ std::vector<SPItem*> g = sp_item_group_item_list(group);
+ for (std::vector<SPItem*>::const_iterator i = g.begin();i!=g.end();i++) {
+ SPItem* child_item = *i;
try_get_intersect_point_with_item_recursive(conn_pv, child_item,
item_transform * child_item->transform, child_pos);
if (intersect_pos < child_pos)