diff options
| author | Laurenz <laurmaedje@gmail.com> | 2023-01-20 14:14:13 +0100 |
|---|---|---|
| committer | Laurenz <laurmaedje@gmail.com> | 2023-01-20 14:21:59 +0100 |
| commit | b73b4f33bcf0e4ff2cfa8438433205cd3a323e43 (patch) | |
| tree | b59ee2c6f46558b7e6a0b2b50e0f7e93afeb3ace /src/export | |
| parent | dd331f007cb9c9968605f8d3eaef8fb498c21322 (diff) | |
Fix a few clippy lints
Diffstat (limited to 'src/export')
| -rw-r--r-- | src/export/pdf/image.rs | 6 | ||||
| -rw-r--r-- | src/export/pdf/page.rs | 2 | ||||
| -rw-r--r-- | src/export/render.rs | 9 |
3 files changed, 10 insertions, 7 deletions
diff --git a/src/export/pdf/image.rs b/src/export/pdf/image.rs index 78731734..906737de 100644 --- a/src/export/pdf/image.rs +++ b/src/export/pdf/image.rs @@ -20,7 +20,7 @@ pub fn write_images(ctx: &mut PdfContext) { match image.decode().unwrap().as_ref() { DecodedImage::Raster(dynamic, format) => { // TODO: Error if image could not be encoded. - let (data, filter, has_color) = encode_image(*format, &dynamic).unwrap(); + let (data, filter, has_color) = encode_image(*format, dynamic).unwrap(); let mut image = ctx.writer.image_xobject(image_ref, &data); image.filter(filter); image.width(width as i32); @@ -37,7 +37,7 @@ pub fn write_images(ctx: &mut PdfContext) { // Add a second gray-scale image containing the alpha values if // this image has an alpha channel. if dynamic.color().has_alpha() { - let (alpha_data, alpha_filter) = encode_alpha(&dynamic); + let (alpha_data, alpha_filter) = encode_alpha(dynamic); let mask_ref = ctx.alloc.bump(); image.s_mask(mask_ref); image.finish(); @@ -52,7 +52,7 @@ pub fn write_images(ctx: &mut PdfContext) { } DecodedImage::Svg(svg) => { let next_ref = svg2pdf::convert_tree_into( - &svg, + svg, svg2pdf::Options::default(), &mut ctx.writer, image_ref, diff --git a/src/export/pdf/page.rs b/src/export/pdf/page.rs index f2ab78e3..d1a2e70e 100644 --- a/src/export/pdf/page.rs +++ b/src/export/pdf/page.rs @@ -289,7 +289,7 @@ fn write_frame(ctx: &mut PageContext, frame: &Frame) { Element::Image(image, size) => write_image(ctx, x, y, image, *size), Element::Meta(meta, size) => match meta { Meta::Link(dest) => write_link(ctx, pos, dest, *size), - _ => {} + Meta::Node(_, _) => {} }, } } diff --git a/src/export/render.rs b/src/export/render.rs index 86648e96..b018608c 100644 --- a/src/export/render.rs +++ b/src/export/render.rs @@ -9,7 +9,7 @@ use tiny_skia as sk; use ttf_parser::{GlyphId, OutlineBuilder}; use usvg::FitTo; -use crate::doc::{Element, Frame, Group, Text}; +use crate::doc::{Element, Frame, Group, Meta, Text}; use crate::geom::{ self, Abs, Geometry, Paint, PathElement, Shape, Size, Stroke, Transform, }; @@ -58,7 +58,10 @@ fn render_frame( Element::Image(image, size) => { render_image(canvas, ts, mask, image, *size); } - Element::Meta(_, _) => {} + Element::Meta(meta, _) => match meta { + Meta::Link(_) => {} + Meta::Node(_, _) => {} + }, } } } @@ -400,7 +403,7 @@ fn scaled_texture(image: &Image, w: u32, h: u32) -> Option<Arc<sk::Pixmap>> { } DecodedImage::Svg(tree) => { resvg::render( - &tree, + tree, FitTo::Size(w, h), sk::Transform::identity(), pixmap.as_mut(), |
