From 997c42f17f8cf5935ff4af3c0db68ec6d97d6de0 Mon Sep 17 00:00:00 2001 From: eugeni Date: Thu, 21 Sep 2006 19:31:28 +0000 Subject: In r19831, font size multiplier was mistakenly applied to border width. Fixed. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19923 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libass/ass_render.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'libass') diff --git a/libass/ass_render.c b/libass/ass_render.c index 783ffab4e5..2b79bda0c5 100644 --- a/libass/ass_render.c +++ b/libass/ass_render.c @@ -142,6 +142,7 @@ typedef struct frame_context_s { long long time; // frame's timestamp, ms double font_scale; double font_scale_x; // x scale applied to all glyphs to preserve text aspect ratio + double border_scale; } frame_context_t; static ass_instance_t* ass_instance; @@ -599,7 +600,7 @@ static void change_border(double border) } render_context.border = border; - b = 64 * border * frame_context.font_scale; + b = 64 * border * frame_context.border_scale; if (b > 0) FT_Stroker_Set( render_context.stroker, b, FT_STROKER_LINECAP_ROUND, @@ -1885,6 +1886,7 @@ static int ass_start_frame(ass_instance_t *priv, ass_track_t* track, long long n frame_context.font_scale = global_settings->font_size_coeff * ass_internal_font_size_coeff * frame_context.orig_height / frame_context.track->PlayResY; + frame_context.border_scale = ((double)frame_context.orig_height) / frame_context.track->PlayResY; if (frame_context.width * track->PlayResY == frame_context.height * track->PlayResX) frame_context.font_scale_x = 1.; -- cgit v1.2.3