Merge branch 'master' into jgrpp
# Conflicts: # src/cargopacket.h # src/cargotype.h # src/station_base.h # src/station_cmd.cpp # src/timer/timer_game_common.h # src/town.h
This commit is contained in:
@@ -151,7 +151,7 @@ void ICURun::Shape(UChar *buff, size_t buff_length)
|
||||
{
|
||||
auto hbfont = hb_ft_font_create_referenced(*(static_cast<const FT_Face *>(font->fc->GetOSHandle())));
|
||||
/* Match the flags with how we render the glyphs. */
|
||||
hb_ft_font_set_load_flags(hbfont, GetFontAAState(this->font->fc->GetSize()) ? FT_LOAD_TARGET_NORMAL : FT_LOAD_TARGET_MONO);
|
||||
hb_ft_font_set_load_flags(hbfont, GetFontAAState() ? FT_LOAD_TARGET_NORMAL : FT_LOAD_TARGET_MONO);
|
||||
|
||||
/* ICU buffer is in UTF-16. */
|
||||
auto hbbuf = hb_buffer_create();
|
||||
|
Reference in New Issue
Block a user