diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/display/drawing-image.cpp | 27 | ||||
| -rw-r--r-- | src/extension/internal/cairo-render-context.cpp | 21 |
2 files changed, 26 insertions, 22 deletions
diff --git a/src/display/drawing-image.cpp b/src/display/drawing-image.cpp index fb1342edf..0ac716dfb 100644 --- a/src/display/drawing-image.cpp +++ b/src/display/drawing-image.cpp @@ -116,26 +116,25 @@ unsigned DrawingImage::_renderItem(DrawingContext &dc, Geom::IntRect const &/*ar if (_style) { // See: http://www.w3.org/TR/SVG/painting.html#ImageRenderingProperty - // http://www.w3.org/TR/css4-images/#the-image-rendering - // It's back in CSS Images 3 now. - // style.h/style.cpp + // https://drafts.csswg.org/css-images-3/#the-image-rendering + // style.h/style.cpp, cairo-render-context.cpp + // + // CSS 3 defines: + // 'optimizeSpeed' as alias for "pixelated" + // 'optimizeQuality' as alias for "smooth" switch (_style->image_rendering.computed) { + case SP_CSS_IMAGE_RENDERING_OPTIMIZESPEED: + case SP_CSS_IMAGE_RENDERING_PIXELATED: + // we don't have an implementation for crisp-edges, but it should *not* smooth or blur + case SP_CSS_IMAGE_RENDERING_CRISPEDGES: + dc.patternSetFilter( CAIRO_FILTER_NEAREST ); + break; case SP_CSS_IMAGE_RENDERING_AUTO: case SP_CSS_IMAGE_RENDERING_OPTIMIZEQUALITY: - case SP_CSS_IMAGE_RENDERING_CRISPEDGES: - // CSS 3 defines: - // 'auto' to use smoothing - // 'optimize-quality' as alias for auto - // We don't have special rendering for 'crisp-edges' yet - // so follow what browsers do. + default: // In recent Cairo, BEST used Lanczos3, which is prohibitively slow dc.patternSetFilter( CAIRO_FILTER_GOOD ); break; - case SP_CSS_IMAGE_RENDERING_OPTIMIZESPEED: - case SP_CSS_IMAGE_RENDERING_PIXELATED: - default: - dc.patternSetFilter( CAIRO_FILTER_NEAREST ); - break; } } diff --git a/src/extension/internal/cairo-render-context.cpp b/src/extension/internal/cairo-render-context.cpp index 60e83afef..adc4f1eb5 100644 --- a/src/extension/internal/cairo-render-context.cpp +++ b/src/extension/internal/cairo-render-context.cpp @@ -1674,18 +1674,23 @@ bool CairoRenderContext::renderImage(Inkscape::Pixbuf *pb, // See cairo-pdf-surface.c if (style) { // See: http://www.w3.org/TR/SVG/painting.html#ImageRenderingProperty - // http://www.w3.org/TR/css4-images/#the-image-rendering - // style.h/style.cpp + // https://drafts.csswg.org/css-images-3/#the-image-rendering + // style.h/style.cpp, drawing-image.cpp + // + // CSS 3 defines: + // 'optimizeSpeed' as alias for "pixelated" + // 'optimizeQuality' as alias for "smooth" switch (style->image_rendering.computed) { - case SP_CSS_IMAGE_RENDERING_AUTO: - case SP_CSS_IMAGE_RENDERING_OPTIMIZEQUALITY: - case SP_CSS_IMAGE_RENDERING_CRISPEDGES: - cairo_pattern_set_filter(cairo_get_source(_cr), CAIRO_FILTER_BEST ); - break; case SP_CSS_IMAGE_RENDERING_OPTIMIZESPEED: case SP_CSS_IMAGE_RENDERING_PIXELATED: + // we don't have an implementation for crisp-edges, but it should *not* smooth or blur + case SP_CSS_IMAGE_RENDERING_CRISPEDGES: + cairo_pattern_set_filter(cairo_get_source(_cr), CAIRO_FILTER_NEAREST); + break; + case SP_CSS_IMAGE_RENDERING_OPTIMIZEQUALITY: + case SP_CSS_IMAGE_RENDERING_AUTO: default: - cairo_pattern_set_filter(cairo_get_source(_cr), CAIRO_FILTER_NEAREST ); + cairo_pattern_set_filter(cairo_get_source(_cr), CAIRO_FILTER_BEST); break; } } |