vlc/vlc-3.0 | branch: master | Francois Cartegnie <[email protected]> | Thu Jul 26 14:02:47 2018 +0200| [a3f3b935fdc8efd34cf7b0c673e68dc862e5dabd] | committer: Francois Cartegnie
text_renderer: freetype: add and default to 0 for freetype-rel-fontsize Overrides relative size inconditionally, and this conflicts with HiDPI fixes where we need only to compute relative font size. Fixes closed caption incorrect font size regression. > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=a3f3b935fdc8efd34cf7b0c673e68dc862e5dabd --- modules/text_renderer/freetype/freetype.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/text_renderer/freetype/freetype.c b/modules/text_renderer/freetype/freetype.c index 53cf99cd18..b92c66ceac 100644 --- a/modules/text_renderer/freetype/freetype.c +++ b/modules/text_renderer/freetype/freetype.c @@ -119,9 +119,9 @@ static void Destroy( vlc_object_t * ); #define TEXT_DIRECTION_LONGTEXT N_("Paragraph base direction for the Unicode bi-directional algorithm.") -static const int pi_sizes[] = { 20, 18, 16, 12, 6 }; +static const int pi_sizes[] = { 0, 20, 18, 16, 12, 6 }; static const char *const ppsz_sizes_text[] = { - N_("Smaller"), N_("Small"), N_("Normal"), N_("Large"), N_("Larger") }; + N_("Auto"), N_("Smaller"), N_("Small"), N_("Normal"), N_("Large"), N_("Larger") }; #define YUVP_TEXT N_("Use YUVP renderer") #define YUVP_LONGTEXT N_("This renders the font using \"paletized YUV\". " \ "This option is only needed if you want to encode into DVB subtitles" ) @@ -171,7 +171,7 @@ vlc_module_begin () change_integer_range( 0, 4096) change_safe() - add_integer( "freetype-rel-fontsize", 16, FONTSIZER_TEXT, + add_integer( "freetype-rel-fontsize", 0, FONTSIZER_TEXT, FONTSIZER_LONGTEXT, false ) change_integer_list( pi_sizes, ppsz_sizes_text ) change_safe() _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
