summaryrefslogtreecommitdiffstats
path: root/src/extension
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2016-10-08 18:30:03 +0000
committerjabiertxof <info@marker.es>2016-10-08 18:30:03 +0000
commit0d65a6366721c314ca82e2600b7a2778e42bfdca (patch)
treed432377950a04fddd169c0b5bb8517345f9cee3e /src/extension
parentKeep selection (diff)
parentmerge trunk-refactoring (diff)
downloadinkscape-0d65a6366721c314ca82e2600b7a2778e42bfdca.tar.gz
inkscape-0d65a6366721c314ca82e2600b7a2778e42bfdca.zip
Update to trunk
(bzr r15142.1.6)
Diffstat (limited to 'src/extension')
-rw-r--r--src/extension/internal/cairo-renderer.cpp6
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();