diff options
| author | Krzysztof Kosi??ski <tweenk.pl@gmail.com> | 2011-04-07 23:42:04 +0000 |
|---|---|---|
| committer | Krzysztof Kosiński <tweenk.pl@gmail.com> | 2011-04-07 23:42:04 +0000 |
| commit | 945ce419c806c73d70203dec33ececafbe108a92 (patch) | |
| tree | cfcdb59bf47e9db7f9e01f7eebb59924bdeaea94 /src/sp-flowregion.cpp | |
| parent | Merge from trunk (again) (diff) | |
| parent | Extensions. SVG+media fix (see Bug #400356). (diff) | |
| download | inkscape-945ce419c806c73d70203dec33ececafbe108a92.tar.gz inkscape-945ce419c806c73d70203dec33ececafbe108a92.zip | |
Merge from trunk
(bzr r9508.1.73)
Diffstat (limited to 'src/sp-flowregion.cpp')
| -rw-r--r-- | src/sp-flowregion.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/sp-flowregion.cpp b/src/sp-flowregion.cpp index 680589b55..46690167f 100644 --- a/src/sp-flowregion.cpp +++ b/src/sp-flowregion.cpp @@ -502,12 +502,12 @@ static void GetDest(SPObject* child,Shape **computed) if ( child == NULL ) return; SPCurve *curve=NULL; - Geom::Matrix tr_mat; + Geom::Affine tr_mat; SPObject* u_child=child; if ( SP_IS_USE(u_child) ) { u_child=SP_USE(u_child)->child; - tr_mat = SP_ITEM(u_child)->getRelativeTransform(SP_OBJECT_PARENT(child)); + tr_mat = SP_ITEM(u_child)->getRelativeTransform(child->parent); } else { tr_mat = SP_ITEM(u_child)->transform; } @@ -524,7 +524,7 @@ static void GetDest(SPObject* child,Shape **computed) temp->Convert(0.25); temp->Fill(n_shp,0); Shape* uncross=new Shape; - SPStyle* style=SP_OBJECT_STYLE(u_child); + SPStyle* style = u_child->style; if ( style && style->fill_rule.computed == SP_WIND_RULE_EVENODD ) { uncross->ConvertToShape(n_shp,fill_oddEven); } else { |