diff options
| author | Alex Valavanis <valavanisalex@gmail.com> | 2013-03-18 12:42:20 +0000 |
|---|---|---|
| committer | Alex Valavanis <valavanisalex@gmail.com> | 2013-03-18 12:42:20 +0000 |
| commit | 152c4d581e6dcb5185cbd9886a80cd7dc5e27c8e (patch) | |
| tree | c242fa52734c90f64c4c8669fb39aa12a3ede26c /src | |
| parent | Fix -Wunused-function warnings (diff) | |
| download | inkscape-152c4d581e6dcb5185cbd9886a80cd7dc5e27c8e.tar.gz inkscape-152c4d581e6dcb5185cbd9886a80cd7dc5e27c8e.zip | |
Fix -Wcast-align issues with SPItemCtx
(bzr r12222)
Diffstat (limited to 'src')
| -rw-r--r-- | src/document.cpp | 2 | ||||
| -rw-r--r-- | src/marker.cpp | 2 | ||||
| -rw-r--r-- | src/sp-item.h | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/src/document.cpp b/src/document.cpp index 97b3bf584..706710cfc 100644 --- a/src/document.cpp +++ b/src/document.cpp @@ -953,7 +953,7 @@ void SPDocument::requestModified() void SPDocument::setupViewport(SPItemCtx *ctx) { - ctx->ctx.flags = 0; + ctx->flags = 0; ctx->i2doc = Geom::identity(); // Set up viewport in case svg has it defined as percentages if (root->viewBox_set) { // if set, take from viewBox diff --git a/src/marker.cpp b/src/marker.cpp index 9717160ed..b3b493b00 100644 --- a/src/marker.cpp +++ b/src/marker.cpp @@ -301,7 +301,7 @@ static void sp_marker_update(SPObject *object, SPCtx *ctx, guint flags) // fixme: We have to set up clip here too // Copy parent context - rctx.ctx = *ctx; + rctx.flags = ctx->flags; // Initialize tranformations rctx.i2doc = Geom::identity(); diff --git a/src/sp-item.h b/src/sp-item.h index e65ffc829..31b7ac034 100644 --- a/src/sp-item.h +++ b/src/sp-item.h @@ -87,9 +87,8 @@ public: #define SP_ITEM_REFERENCE_FLAGS (1 << 1) /// Contains transformations to document/viewport and the viewport size. -class SPItemCtx { +class SPItemCtx : public SPCtx { public: - SPCtx ctx; /** Item to document transformation */ Geom::Affine i2doc; /** Viewport size */ |
