From a303321365bf5ae640715eb9e033f6f01cb085c8 Mon Sep 17 00:00:00 2001 From: Martin Owens Date: Sat, 5 Apr 2014 08:15:20 +0200 Subject: Allow command line options -i and -j to effect plain-svg output, this involves cropping and reducing. (bzr r13268) --- src/sp-object.cpp | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'src/sp-object.cpp') diff --git a/src/sp-object.cpp b/src/sp-object.cpp index be3a1ab9d..c904705fb 100644 --- a/src/sp-object.cpp +++ b/src/sp-object.cpp @@ -460,6 +460,23 @@ void SPObject::deleteObject(bool propagate, bool propagate_descendants) sp_object_unref(this, NULL); } +void SPObject::cropToObject(SPObject *except) +{ + GSList *toDelete = NULL; + for ( SPObject *child = this->firstChild(); child; child = child->getNext() ) { + if (SP_IS_ITEM(child)) { + if (child->isAncestorOf(except)) { + child->cropToObject(except); + } else if(child != except) { + toDelete = g_slist_append(toDelete, child); + } + } + } + for (GSList *item = toDelete; item; item = item->next) { + SP_OBJECT(item->data)->deleteObject(true, true); + } +} + void SPObject::attach(SPObject *object, SPObject *prev) { //g_return_if_fail(parent != NULL); -- cgit v1.2.3 From 77ba51de31dadeed7d4496a01824238320887dc8 Mon Sep 17 00:00:00 2001 From: Martin Owens Date: Sat, 5 Apr 2014 15:11:12 +0200 Subject: Commit patch from Johan to remove GSList and replace with vector. (bzr r13271) --- src/sp-object.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/sp-object.cpp') diff --git a/src/sp-object.cpp b/src/sp-object.cpp index c904705fb..65228ec0a 100644 --- a/src/sp-object.cpp +++ b/src/sp-object.cpp @@ -462,18 +462,18 @@ void SPObject::deleteObject(bool propagate, bool propagate_descendants) void SPObject::cropToObject(SPObject *except) { - GSList *toDelete = NULL; + std::vector toDelete; for ( SPObject *child = this->firstChild(); child; child = child->getNext() ) { if (SP_IS_ITEM(child)) { if (child->isAncestorOf(except)) { child->cropToObject(except); } else if(child != except) { - toDelete = g_slist_append(toDelete, child); + toDelete.push_back(child); } } } - for (GSList *item = toDelete; item; item = item->next) { - SP_OBJECT(item->data)->deleteObject(true, true); + for (std::size_t i = 0; i < toDelete.size(); ++i) { + (toDelete[i])->deleteObject(true, true); } } -- cgit v1.2.3