diff options
| author | Sebastian Wüst <sebi@timewaster.de> | 2013-10-20 15:32:08 +0000 |
|---|---|---|
| committer | Sebastian Wüst <sebi@timewaster.de> | 2013-10-20 15:32:08 +0000 |
| commit | 82908f949129e1fcbf62002799ee7b1b77986eed (patch) | |
| tree | c02098dd7720cdf424f2793ecd3ddac2ea86b969 /src/sp-mesh-array.cpp | |
| parent | changed text (diff) | |
| parent | Fix build errors with clang 3.3 and c++11 enabled. (diff) | |
| download | inkscape-82908f949129e1fcbf62002799ee7b1b77986eed.tar.gz inkscape-82908f949129e1fcbf62002799ee7b1b77986eed.zip | |
merge from trunk
(bzr r12417.1.24)
Diffstat (limited to 'src/sp-mesh-array.cpp')
| -rw-r--r-- | src/sp-mesh-array.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/sp-mesh-array.cpp b/src/sp-mesh-array.cpp index 2c3c7fa65..5a204e8b0 100644 --- a/src/sp-mesh-array.cpp +++ b/src/sp-mesh-array.cpp @@ -1058,9 +1058,9 @@ void SPMeshNodeArray::create( SPMeshGradient *mg, SPItem *item, Geom::OptRect bb end = start + 2.0 * M_PI; } - if ( SP_IS_ARC( item ) ) { + if ( SP_IS_GENERICELLIPSE( item ) ) { // For arcs use set start/stop - SPArc* arc = SP_ARC( item ); + SPGenericEllipse* arc = SP_GENERICELLIPSE( item ); center[Geom::X] = arc->cx.computed; center[Geom::Y] = arc->cy.computed; rx = arc->rx.computed; @@ -1130,11 +1130,11 @@ void SPMeshNodeArray::create( SPMeshGradient *mg, SPItem *item, Geom::OptRect bb // Normal grid meshes - if( SP_IS_ARC( item ) ) { + if( SP_IS_GENERICELLIPSE( item ) ) { // std::cout << "We've got ourselves an arc!" << std::endl; - SPArc* arc = SP_ARC( item ); + SPGenericEllipse* arc = SP_GENERICELLIPSE( item ); center[Geom::X] = arc->cx.computed; center[Geom::Y] = arc->cy.computed; gdouble rx = arc->rx.computed; |