RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-06-01 08:28:11 +00:00
Code Issues Activity Actions

LibTTF: Make TTF::Font loading API return error strings

Browse source
This commit is contained in:
Andreas Kling 2021-07-04 19:06:39 +02:00
parent 9321d9d83d
commit 560109bd42
4 changed files with 58 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Userland/Libraries/LibGfx/FontDatabase.cpp
View file

@ -99,9 +99,10 @@ FontDatabase::FontDatabase()
}
} else if (path.ends_with(".ttf"sv)) {
// FIXME: What about .otf and .woff
if (auto font = TTF::Font::load_from_file(path)) {
if (auto font_or_error = TTF::Font::try_load_from_file(path); !font_or_error.is_error()) {
auto font = font_or_error.release_value();
auto typeface = get_or_create_typeface(font->family(), font->variant());
typeface->set_ttf_font(font);
typeface->set_ttf_font(move(font));
}
}
}