Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Refactor FontExt::new to simplify face parsing logic and fix MacOS panic #692

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Refactor FontExt::new to simplify face parsing logic and fix MacOS panic #692

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions plotters/src/style/font/ttf.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,13 @@ impl Drop for FontExt {
impl FontExt {
fn new(font: Font) -> Self {
let handle = font.handle();
let (data, idx) = match handle.as_ref() {
Some(Handle::Memory { bytes, font_index }) => (&bytes[..], *font_index),
_ => unreachable!(),
};
let face = unsafe {
std::mem::transmute::<Option<_>, Option<Face<'static>>>(
ttf_parser::Face::parse(data, idx).ok(),
)
let face = match handle.as_ref() {
Some(Handle::Memory { bytes, font_index }) => unsafe {
std::mem::transmute::<Option<_>, Option<Face<'static>>>(
ttf_parser::Face::parse(bytes, *font_index).ok(),
)
},
_ => None,
};
Self { inner: font, face }
}
Expand Down