diff options
Diffstat (limited to 'src/export')
| -rw-r--r-- | src/export/pdf/font.rs | 2 | ||||
| -rw-r--r-- | src/export/pdf/outline.rs | 2 | ||||
| -rw-r--r-- | src/export/pdf/page.rs | 1 | ||||
| -rw-r--r-- | src/export/render.rs | 24 |
4 files changed, 17 insertions, 12 deletions
diff --git a/src/export/pdf/font.rs b/src/export/pdf/font.rs index 3398478a..075e3490 100644 --- a/src/export/pdf/font.rs +++ b/src/export/pdf/font.rs @@ -5,7 +5,7 @@ use pdf_writer::{Filter, Finish, Name, Rect, Str}; use ttf_parser::{name_id, GlyphId, Tag}; use super::{deflate, EmExt, PdfContext, RefExt}; -use crate::util::SliceExt; +use crate::util::{format_eco, SliceExt}; /// Embed all used fonts into the PDF. pub fn write_fonts(ctx: &mut PdfContext) { diff --git a/src/export/pdf/outline.rs b/src/export/pdf/outline.rs index 73dd9e96..add167b4 100644 --- a/src/export/pdf/outline.rs +++ b/src/export/pdf/outline.rs @@ -71,7 +71,7 @@ pub fn write_outline_item( let current_child = Ref::new(id.get() + 1); outline.first(current_child); outline.last(Ref::new(next_ref.get() - 1)); - outline.count(-1 * node.children.len() as i32); + outline.count(-(node.children.len() as i32)); } outline.title(TextStr(&node.heading.content)); diff --git a/src/export/pdf/page.rs b/src/export/pdf/page.rs index 7fbf7833..3167989c 100644 --- a/src/export/pdf/page.rs +++ b/src/export/pdf/page.rs @@ -12,6 +12,7 @@ use crate::geom::{ Transform, }; use crate::image::Image; +use crate::util::format_eco; /// Construct page objects. pub fn construct_pages(ctx: &mut PdfContext, frames: &[Frame]) { diff --git a/src/export/render.rs b/src/export/render.rs index df8f512f..41fff863 100644 --- a/src/export/render.rs +++ b/src/export/render.rs @@ -312,8 +312,10 @@ fn render_shape( if let Some(Stroke { paint, thickness }) = shape.stroke { let paint = paint.into(); - let mut stroke = sk::Stroke::default(); - stroke.width = thickness.to_f32(); + let stroke = sk::Stroke { + width: thickness.to_f32(), + ..Default::default() + }; canvas.stroke_path(&path, &paint, &stroke, ts, mask); } @@ -364,14 +366,16 @@ fn render_image( let scale_x = view_width / pixmap.width() as f32; let scale_y = view_height / pixmap.height() as f32; - let mut paint = sk::Paint::default(); - paint.shader = sk::Pattern::new( - pixmap.as_ref(), - sk::SpreadMode::Pad, - sk::FilterQuality::Nearest, - 1.0, - sk::Transform::from_scale(scale_x, scale_y), - ); + let paint = sk::Paint { + shader: sk::Pattern::new( + pixmap.as_ref(), + sk::SpreadMode::Pad, + sk::FilterQuality::Nearest, + 1.0, + sk::Transform::from_scale(scale_x, scale_y), + ), + ..Default::default() + }; let rect = sk::Rect::from_xywh(0.0, 0.0, view_width, view_height)?; canvas.fill_rect(rect, &paint, ts, mask); |
