remove many unnecessary to_2geom and from_2geom calls

[inkscape.git] / src / sp-flowregion.cpp

diff --git a/src/sp-flowregion.cpp b/src/sp-flowregion.cpp
index b989b52fb1b4a5ed3f02d1a302371e38379b33eb..490407f81150ef9dc7e1dffa09d9ad8483865623 100644 (file)
--- a/src/sp-flowregion.cpp
+++ b/src/sp-flowregion.cpp
@@ -32,7 +32,7 @@ static void sp_flowregion_child_added (SPObject * object, Inkscape::XML::Node *
 static void sp_flowregion_remove_child (SPObject * object, Inkscape::XML::Node * child);
 static void sp_flowregion_update (SPObject *object, SPCtx *ctx, guint flags);
 static void sp_flowregion_modified (SPObject *object, guint flags);
-static Inkscape::XML::Node *sp_flowregion_write (SPObject *object, Inkscape::XML::Node *repr, guint flags);
+static Inkscape::XML::Node *sp_flowregion_write (SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags);
 
 static gchar * sp_flowregion_description (SPItem * item);
 
@@ -46,7 +46,7 @@ static void sp_flowregionexclude_child_added (SPObject * object, Inkscape::XML::
 static void sp_flowregionexclude_remove_child (SPObject * object, Inkscape::XML::Node * child);
 static void sp_flowregionexclude_update (SPObject *object, SPCtx *ctx, guint flags);
 static void sp_flowregionexclude_modified (SPObject *object, guint flags);
-static Inkscape::XML::Node *sp_flowregionexclude_write (SPObject *object, Inkscape::XML::Node *repr, guint flags);
+static Inkscape::XML::Node *sp_flowregionexclude_write (SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags);
 
 static gchar * sp_flowregionexclude_description (SPItem * item);
 
@@ -188,8 +188,8 @@ void             SPFlowregion::UpdateComputed(void)
 {
        SPObject* object=SP_OBJECT(this);
 
-       NR::Matrix itr_mat=sp_item_i2root_affine (SP_ITEM(object));
-       itr_mat=itr_mat.inverse();
+    NR::Matrix itr_mat (sp_item_i2root_affine (SP_ITEM(object)));
+    itr_mat = itr_mat.inverse();
 
     for (std::vector<Shape*>::iterator it = computed.begin() ; it != computed.end() ; it++)
         delete *it;
@@ -231,17 +231,16 @@ sp_flowregion_modified (SPObject *object, guint flags)
 }
 
 static Inkscape::XML::Node *
-sp_flowregion_write (SPObject *object, Inkscape::XML::Node *repr, guint flags)
+sp_flowregion_write (SPObject *object, Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, guint flags)
 {
     if (flags & SP_OBJECT_WRITE_BUILD) {
        if ( repr == NULL ) {
-            Inkscape::XML::Document *xml_doc = sp_document_repr_doc(SP_OBJECT_DOCUMENT(object));
             repr = xml_doc->createElement("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);
+            Inkscape::XML::Node *crepr = child->updateRepr(xml_doc, NULL, flags);
             if (crepr) l = g_slist_prepend(l, crepr);
         }
 
@@ -258,7 +257,7 @@ sp_flowregion_write (SPObject *object, Inkscape::XML::Node *repr, guint flags)
     }
 
        if (((SPObjectClass *) (flowregion_parent_class))->write)
-               ((SPObjectClass *) (flowregion_parent_class))->write (object, repr, flags);
+               ((SPObjectClass *) (flowregion_parent_class))->write (object, xml_doc, repr, flags);
 
        return repr;
 }
@@ -407,12 +406,12 @@ void             SPFlowregionExclude::UpdateComputed(void)
 {
        SPObject* object=SP_OBJECT(this);
 
-       if (computed) {
+    if (computed) {
         delete computed;
         computed = NULL;
     }
-       NR::Matrix itr_mat=sp_item_i2root_affine (SP_ITEM(object));
-       itr_mat=itr_mat.inverse();
+    NR::Matrix itr_mat (sp_item_i2root_affine (SP_ITEM(object)));
+    itr_mat = itr_mat.inverse();
 
        for (SPObject* child = sp_object_first_child(object) ; child != NULL ; child = SP_OBJECT_NEXT(child) ) {
                GetDest(child,&computed,itr_mat);
@@ -448,17 +447,16 @@ sp_flowregionexclude_modified (SPObject *object, guint flags)
 }
 
 static Inkscape::XML::Node *
-sp_flowregionexclude_write (SPObject *object, Inkscape::XML::Node *repr, guint flags)
+sp_flowregionexclude_write (SPObject *object, Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, guint flags)
 {
     if (flags & SP_OBJECT_WRITE_BUILD) {
         if ( repr == NULL ) {
-           Inkscape::XML::Document *xml_doc = sp_document_repr_doc(SP_OBJECT_DOCUMENT(object));
             repr = xml_doc->createElement("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);
+            Inkscape::XML::Node *crepr = child->updateRepr(xml_doc, NULL, flags);
             if (crepr) l = g_slist_prepend(l, crepr);
         }
 
@@ -475,7 +473,7 @@ sp_flowregionexclude_write (SPObject *object, Inkscape::XML::Node *repr, guint f
     }
 
        if (((SPObjectClass *) (flowregionexclude_parent_class))->write)
-               ((SPObjectClass *) (flowregionexclude_parent_class))->write (object, repr, flags);
+               ((SPObjectClass *) (flowregionexclude_parent_class))->write (object, xml_doc, repr, flags);
 
        return repr;
 }
@@ -526,9 +524,9 @@ static void         GetDest(SPObject* child,Shape **computed,NR::Matrix itr_mat)
 
        if ( curve ) {
                Path*   temp=new Path;
-               NR::Matrix tr_mat=sp_item_i2root_affine (SP_ITEM(u_child));
-               tr_mat=itr_mat*tr_mat;
-               temp->LoadArtBPath(SP_CURVE_BPATH(curve),tr_mat,true);
+        Geom::Matrix tr_mat = sp_item_i2root_affine (SP_ITEM(u_child));
+        tr_mat = (Geom::Matrix)itr_mat * tr_mat;
+        temp->LoadPathVector(curve->get_pathvector(), tr_mat, true);
                Shape*  n_shp=new Shape;
                temp->Convert(0.25);
                temp->Fill(n_shp,0);