X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fsp-flowregion.cpp;h=51bc4c511be61d872c5966115971feb75669c883;hb=a9a0b21abc8ca237bb6740528d6d3593b888b10a;hp=5c01483c8f36ed762eb3bbba59eeeb13f02e8740;hpb=1391834bee278d740c12201a5f258cd1eda044c1;p=inkscape.git diff --git a/src/sp-flowregion.cpp b/src/sp-flowregion.cpp index 5c01483c8..51bc4c511 100644 --- a/src/sp-flowregion.cpp +++ b/src/sp-flowregion.cpp @@ -234,19 +234,19 @@ sp_flowregion_write (SPObject *object, Inkscape::XML::Node *repr, guint flags) { if (flags & SP_OBJECT_WRITE_BUILD) { if ( repr == NULL ) repr = sp_repr_new ("svg:flowRegion"); - + GSList *l = NULL; for ( SPObject *child = sp_object_first_child(object) ; child != NULL; child = SP_OBJECT_NEXT(child) ) { Inkscape::XML::Node *crepr = child->updateRepr(NULL, flags); if (crepr) l = g_slist_prepend(l, crepr); } - + while (l) { repr->addChild((Inkscape::XML::Node *) l->data, NULL); Inkscape::GC::release((Inkscape::XML::Node *) l->data); l = g_slist_remove(l, l->data); } - + } else { for ( SPObject *child = sp_object_first_child(object) ; child != NULL; child = SP_OBJECT_NEXT(child) ) { child->updateRepr(flags); @@ -448,19 +448,19 @@ sp_flowregionexclude_write (SPObject *object, Inkscape::XML::Node *repr, guint f { if (flags & SP_OBJECT_WRITE_BUILD) { if ( repr == NULL ) repr = sp_repr_new ("svg:flowRegionExclude"); - + GSList *l = NULL; for ( SPObject *child = sp_object_first_child(object) ; child != NULL; child = SP_OBJECT_NEXT(child) ) { Inkscape::XML::Node *crepr = child->updateRepr(NULL, flags); if (crepr) l = g_slist_prepend(l, crepr); } - + while (l) { repr->addChild((Inkscape::XML::Node *) l->data, NULL); Inkscape::GC::release((Inkscape::XML::Node *) l->data); l = g_slist_remove(l, l->data); } - + } else { for ( SPObject *child = sp_object_first_child(object) ; child != NULL; child = SP_OBJECT_NEXT(child) ) { child->updateRepr(flags); @@ -521,7 +521,7 @@ static void GetDest(SPObject* child,Shape **computed,NR::Matrix itr_mat) Path* temp=new Path; NR::Matrix tr_mat=sp_item_i2root_affine (SP_ITEM(u_child)); tr_mat=itr_mat*tr_mat; - temp->LoadArtBPath(curve->bpath,tr_mat,true); + temp->LoadArtBPath(SP_CURVE_BPATH(curve),tr_mat,true); Shape* n_shp=new Shape; temp->Convert(0.25); temp->Fill(n_shp,0);