Mercurial > mplayer.hg

changeset 19917:6a31849e2b80

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
In r19831, font size multiplier was mistakenly applied to border width. Fixed.
author eugeni
date Thu, 21 Sep 2006 19:31:28 +0000
parents 3c9f5824444e
children 1de67089c19a
files libass/ass_render.c
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libass/ass_render.c	Thu Sep 21 14:26:08 2006 +0000
+++ b/libass/ass_render.c	Thu Sep 21 19:31:28 2006 +0000
@@ -142,6 +142,7 @@
 	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 @@
 		}
 		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 @@
 	
 	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.;