diff options
| author | Marc Jeanmougin <marc@jeanmougin.fr> | 2016-10-08 16:05:13 +0000 |
|---|---|---|
| committer | Marc Jeanmougin <marcjeanmougin@free.fr> | 2016-10-08 16:05:13 +0000 |
| commit | 6092d5422b03608db00f18e6ad8c87465b5dc3e8 (patch) | |
| tree | 2ae791c03acda4ca0bf1cc2fb309a94c39cbd058 /src/extension/internal/cairo-renderer.cpp | |
| parent | [Bug #770681] KEY MAPPING: Comma and period hijacked by scaling. (diff) | |
| parent | Made the style-utils.h license dual-with-GPLv2+. (diff) | |
| download | inkscape-6092d5422b03608db00f18e6ad8c87465b5dc3e8.tar.gz inkscape-6092d5422b03608db00f18e6ad8c87465b5dc3e8.zip | |
merge trunk-refactoring
(bzr r15156)
Diffstat (limited to 'src/extension/internal/cairo-renderer.cpp')
| -rw-r--r-- | src/extension/internal/cairo-renderer.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/extension/internal/cairo-renderer.cpp b/src/extension/internal/cairo-renderer.cpp index cd96a7f58..a2b8fb22f 100644 --- a/src/extension/internal/cairo-renderer.cpp +++ b/src/extension/internal/cairo-renderer.cpp @@ -541,8 +541,7 @@ static void sp_item_invoke_render(SPItem *item, CairoRenderContext *ctx) return; } - SPStyle* style = item->style; - if((ctx->getFilterToBitmap() == TRUE) && (style->filter.set != 0)) { + if(ctx->getFilterToBitmap() && (item->style->filter.set != 0)) { return sp_asbitmap_render(item, ctx); } @@ -599,8 +598,7 @@ static void sp_item_invoke_render(SPItem *item, CairoRenderContext *ctx) void CairoRenderer::setStateForItem(CairoRenderContext *ctx, SPItem const *item) { - SPStyle const *style = item->style; - ctx->setStateForStyle(style); + ctx->setStateForStyle(item->style); CairoRenderState *state = ctx->getCurrentState(); state->clip_path = item->clip_ref->getObject(); |