diff options
| author | Johan B. C. Engelen <jbc.engelen@swissonline.ch> | 2008-06-12 20:20:51 +0000 |
|---|---|---|
| committer | johanengelen <johanengelen@users.sourceforge.net> | 2008-06-12 20:20:51 +0000 |
| commit | 21f04a292dafc2cfd1374609720c458124c5b9a4 (patch) | |
| tree | 1a38adb5df88eb36bafb6d055b55faf6b0d69cba /src/sp-flowregion.cpp | |
| parent | update 2geom (diff) | |
| download | inkscape-21f04a292dafc2cfd1374609720c458124c5b9a4.tar.gz inkscape-21f04a292dafc2cfd1374609720c458124c5b9a4.zip | |
change NR::Matrix to Geom:: for many sp_item_xxx_affine functions
(bzr r5915)
Diffstat (limited to 'src/sp-flowregion.cpp')
| -rw-r--r-- | src/sp-flowregion.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/sp-flowregion.cpp b/src/sp-flowregion.cpp index 3a6cdeee3..61fcdd08c 100644 --- a/src/sp-flowregion.cpp +++ b/src/sp-flowregion.cpp @@ -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 = from_2geom(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; @@ -406,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 = from_2geom(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); @@ -524,7 +524,7 @@ 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)); + NR::Matrix tr_mat = from_2geom(sp_item_i2root_affine (SP_ITEM(u_child))); tr_mat=itr_mat*tr_mat; temp->LoadArtBPath(SP_CURVE_BPATH(curve),tr_mat,true); Shape* n_shp=new Shape; |