diff options
| author | Marc Jeanmougin <marc@jeanmougin.fr> | 2017-11-21 00:14:59 +0000 |
|---|---|---|
| committer | Marc Jeanmougin <marc@jeanmougin.fr> | 2017-11-21 00:14:59 +0000 |
| commit | 76a1511675df9e1033f2c17115f3e47667d65f9b (patch) | |
| tree | b1d3c4604a0a4b19f849e856e46a594bcc0e9477 /src/extension/internal/cairo-render-context.cpp | |
| parent | Remove invisible bitmap image in Tango color management icon (diff) | |
| parent | Fix printing multiple copies of a document (diff) | |
| download | inkscape-76a1511675df9e1033f2c17115f3e47667d65f9b.tar.gz inkscape-76a1511675df9e1033f2c17115f3e47667d65f9b.zip | |
Merge branch 'print_copies' of gitlab.com:Ede123/inkscape
Diffstat (limited to 'src/extension/internal/cairo-render-context.cpp')
| -rw-r--r-- | src/extension/internal/cairo-render-context.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/extension/internal/cairo-render-context.cpp b/src/extension/internal/cairo-render-context.cpp index 972081c0d..16100dc88 100644 --- a/src/extension/internal/cairo-render-context.cpp +++ b/src/extension/internal/cairo-render-context.cpp @@ -878,7 +878,7 @@ CairoRenderContext::_finishSurfaceSetup(cairo_surface_t *surface, cairo_matrix_t } bool -CairoRenderContext::finish(void) +CairoRenderContext::finish(bool finish_surface) { g_assert( _is_valid ); @@ -893,10 +893,13 @@ CairoRenderContext::finish(void) } cairo_destroy(_cr); - cairo_surface_finish(_surface); - cairo_status_t status = cairo_surface_status(_surface); - cairo_surface_destroy(_surface); _cr = NULL; + + if (finish_surface) + cairo_surface_finish(_surface); + cairo_status_t status = cairo_surface_status(_surface); + if (finish_surface) + cairo_surface_destroy(_surface); _surface = NULL; if (_layout) |