From 71aa12c07658202aabf84dc6aa4808b5ec84b368 Mon Sep 17 00:00:00 2001 From: vangel76 Date: Mon, 26 Oct 2026 02:16:31 +0100 Subject: [PATCH] Fix hinting tests and imports after merging upstream/main Co-Authored-By: Claude Sonnet 5.5 --- crates/fonts/src/fontdb.rs | 4 +++- crates/fonts/src/tests_sysfonts.rs | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/crates/fonts/src/fontdb.rs b/crates/fonts/src/fontdb.rs index cacdb596d2..7b68dbe866 100644 --- a/crates/fonts/src/fontdb.rs +++ b/crates/fonts/src/fontdb.rs @@ -7,7 +7,9 @@ use std::sync::{Arc, Mutex, RwLock}; use kurbo::BezPath; use skrifa::instance::{Location, LocationRef, Size}; -use skrifa::outline::{DrawSettings, Engine, GlyphStyles, Hinting, HintingInstance, HintingOptions, OutlineGlyphFormat, OutlinePen, SmoothMode, Target}; +use skrifa::outline::{ + DrawSettings, Engine, GlyphStyles, Hinting, HintingInstance, HintingOptions, OutlineGlyphFormat, OutlinePen, SmoothMode, Target, +}; use skrifa::raw::FileRef; use skrifa::string::StringId; use skrifa::{GlyphId, MetadataProvider}; diff --git a/crates/fonts/src/tests_sysfonts.rs b/crates/fonts/src/tests_sysfonts.rs index 1259a9c7db..9fc975dfac 100644 --- a/crates/fonts/src/tests_sysfonts.rs +++ b/crates/fonts/src/tests_sysfonts.rs @@ -436,9 +436,9 @@ fn screen_hinting_runs_a_tricky_fonts_instructions_with_the_monochrome_target() let ppem = 11.0 * 96.0 / 72.0 * 1.45; let drawn = |target: Target, gid: u32| { let h = HintingInstance::new(&outlines, Size::new(ppem), face.location(), HintingOptions { engine: Engine::Interpreter, target }).unwrap(); - let mut pen = FlipPen(BezPath::new()); + let mut pen = FlipPen { path: BezPath::new(), room: usize::MAX, over: false }; outlines.get(GlyphId::new(gid)).unwrap().draw(DrawSettings::hinted(&h, false), &mut pen).unwrap(); - pen.0 + pen.path }; // The target decides whether the instructions may move points sideways (the light target's // backward compatibility forbids it): this font's instructions only move points vertically,