diff --git a/src/export/render.rs b/src/export/render.rs index b56a053b5..4933edf0b 100644 --- a/src/export/render.rs +++ b/src/export/render.rs @@ -2,6 +2,7 @@ use std::io::Read; +use image::imageops::FilterType; use image::{GenericImageView, Rgba}; use tiny_skia as sk; use ttf_parser::{GlyphId, OutlineBuilder}; @@ -351,33 +352,35 @@ fn render_image( let view_width = size.x.to_f32(); let view_height = size.y.to_f32(); - let pixmap = match img { + let aspect = (img.width() as f32) / (img.height() as f32); + let scale = ts.sx.max(ts.sy); + let w = (scale * view_width.max(aspect * view_height)).ceil() as u32; + let h = ((w as f32) / aspect).ceil() as u32; + + let mut pixmap = sk::Pixmap::new(w, h)?; + match img { Image::Raster(img) => { - let w = img.buf.width(); - let h = img.buf.height(); - let mut pixmap = sk::Pixmap::new(w, h)?; - for ((_, _, src), dest) in img.buf.pixels().zip(pixmap.pixels_mut()) { + let downscale = w < img.width(); + let filter = if downscale { + FilterType::Lanczos3 + } else { + FilterType::CatmullRom + }; + let buf = img.buf.resize(w, h, filter); + for ((_, _, src), dest) in buf.pixels().zip(pixmap.pixels_mut()) { let Rgba([r, g, b, a]) = src; *dest = sk::ColorU8::from_rgba(r, g, b, a).premultiply(); } - pixmap } Image::Svg(Svg(tree)) => { - let size = tree.svg_node().size; - let aspect = (size.width() / size.height()) as f32; - let scale = ts.sx.max(ts.sy); - let w = (scale * view_width.max(aspect * view_height)).ceil() as u32; - let h = ((w as f32) / aspect).ceil() as u32; - let mut pixmap = sk::Pixmap::new(w, h)?; resvg::render( &tree, FitTo::Size(w, h), sk::Transform::identity(), pixmap.as_mut(), - ); - pixmap + )?; } - }; + } let scale_x = view_width / pixmap.width() as f32; let scale_y = view_height / pixmap.height() as f32; @@ -386,7 +389,7 @@ fn render_image( paint.shader = sk::Pattern::new( pixmap.as_ref(), sk::SpreadMode::Pad, - sk::FilterQuality::Bilinear, + sk::FilterQuality::Nearest, 1.0, sk::Transform::from_scale(scale_x, scale_y), ); diff --git a/tests/ref/coma.png b/tests/ref/coma.png index 817c756ab..62edb5e08 100644 Binary files a/tests/ref/coma.png and b/tests/ref/coma.png differ diff --git a/tests/ref/graphics/image.png b/tests/ref/graphics/image.png index 11a289809..a89f1963b 100644 Binary files a/tests/ref/graphics/image.png and b/tests/ref/graphics/image.png differ diff --git a/tests/ref/graphics/transform.png b/tests/ref/graphics/transform.png index 1cb8efcd4..cb4b0af28 100644 Binary files a/tests/ref/graphics/transform.png and b/tests/ref/graphics/transform.png differ diff --git a/tests/ref/layout/grid-3.png b/tests/ref/layout/grid-3.png index c44dae707..c17a5873e 100644 Binary files a/tests/ref/layout/grid-3.png and b/tests/ref/layout/grid-3.png differ diff --git a/tests/ref/layout/pad.png b/tests/ref/layout/pad.png index 7c27bd268..55880ed1a 100644 Binary files a/tests/ref/layout/pad.png and b/tests/ref/layout/pad.png differ diff --git a/tests/ref/layout/place-background.png b/tests/ref/layout/place-background.png index 99350bf8c..eb2c4b71c 100644 Binary files a/tests/ref/layout/place-background.png and b/tests/ref/layout/place-background.png differ diff --git a/tests/ref/layout/place.png b/tests/ref/layout/place.png index 6fc117063..f40b8c686 100644 Binary files a/tests/ref/layout/place.png and b/tests/ref/layout/place.png differ diff --git a/tests/ref/style/set.png b/tests/ref/style/set.png index 52512b855..502d74b5d 100644 Binary files a/tests/ref/style/set.png and b/tests/ref/style/set.png differ diff --git a/tests/ref/style/show-text.png b/tests/ref/style/show-text.png index ae5230f16..b88e1f308 100644 Binary files a/tests/ref/style/show-text.png and b/tests/ref/style/show-text.png differ diff --git a/tests/ref/text/bidi.png b/tests/ref/text/bidi.png index 6f4c8acb3..c9be82d40 100644 Binary files a/tests/ref/text/bidi.png and b/tests/ref/text/bidi.png differ diff --git a/tests/ref/text/emoji.png b/tests/ref/text/emoji.png index 3f3f698d1..2036a6fc9 100644 Binary files a/tests/ref/text/emoji.png and b/tests/ref/text/emoji.png differ diff --git a/tests/ref/text/fallback.png b/tests/ref/text/fallback.png index ae840734b..bcd0942ad 100644 Binary files a/tests/ref/text/fallback.png and b/tests/ref/text/fallback.png differ diff --git a/tests/ref/text/indent.png b/tests/ref/text/indent.png index 2196c33cb..2d7a2e385 100644 Binary files a/tests/ref/text/indent.png and b/tests/ref/text/indent.png differ diff --git a/tests/ref/text/link.png b/tests/ref/text/link.png index 5a9b4ca3b..fd1a3f21d 100644 Binary files a/tests/ref/text/link.png and b/tests/ref/text/link.png differ