Skip to content

Remove forced fallback from FT2Font::load_char #30627

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
tacaswell merged 1 commit into from
Nov 6, 2025
Merged

Remove forced fallback from FT2Font::load_char #30627

Show file tree
Hide file tree
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
9 changes: 4 additions & 5 deletions src/ft2font.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -552,7 +552,7 @@ void FT2Font::load_char(long charcode, FT_Int32 flags, FT2Font *&ft_object, bool
bool was_found = load_char_with_fallback(ft_object_with_glyph, final_glyph_index,
glyphs, char_to_font,
charcode, flags, charcode_error, glyph_error,
glyph_seen_fonts, true);
glyph_seen_fonts);
if (!was_found) {
ft_glyph_warn(charcode, glyph_seen_fonts);
if (charcode_error) {
Expand Down Expand Up @@ -613,15 +613,14 @@ bool FT2Font::load_char_with_fallback(FT2Font *&ft_object_with_glyph,
FT_Int32 flags,
FT_Error &charcode_error,
FT_Error &glyph_error,
std::set<FT_String*> &glyph_seen_fonts,
bool override = false)
std::set<FT_String*> &glyph_seen_fonts)
{
FT_UInt glyph_index = FT_Get_Char_Index(face, charcode);
if (!warn_if_used) {
glyph_seen_fonts.insert(face->family_name);
}

if (glyph_index || override) {
if (glyph_index) {
charcode_error = FT_Load_Glyph(face, glyph_index, flags);
if (charcode_error) {
return false;
Expand All @@ -647,7 +646,7 @@ bool FT2Font::load_char_with_fallback(FT2Font *&ft_object_with_glyph,
bool was_found = fallback->load_char_with_fallback(
ft_object_with_glyph, final_glyph_index, parent_glyphs,
parent_char_to_font, charcode, flags,
charcode_error, glyph_error, glyph_seen_fonts, override);
charcode_error, glyph_error, glyph_seen_fonts);
if (was_found) {
return true;
}
Expand Down
3 changes: 1 addition & 2 deletions src/ft2font.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,7 @@ class FT2Font
FT_Int32 flags,
FT_Error &charcode_error,
FT_Error &glyph_error,
std::set<FT_String*> &glyph_seen_fonts,
bool override);
std::set<FT_String*> &glyph_seen_fonts);
void load_glyph(FT_UInt glyph_index, FT_Int32 flags);
std::tuple<long, long> get_width_height();
std::tuple<long, long> get_bitmap_offset();
Expand Down
Loading