From 4f43ff2ca3bed41dfd122d1a34e88c08c06ca795 Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 26 Feb 2015 20:49:10 +0100 Subject: Always use the new style with \r and style overrides I don't know why it was done this way, but some fields were always taken from the event's style, instead of the (possibly different) \r style. Undo this, as it seems like an unnecessary complication. --- libass/ass_render.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libass/ass_render.c b/libass/ass_render.c index 6140788..2a36647 100644 --- a/libass/ass_render.c +++ b/libass/ass_render.c @@ -782,12 +782,12 @@ static ASS_Style *handle_selective_style_overrides(ASS_Renderer *render_priv, new->Underline = rstyle->Underline; new->Angle = rstyle->Angle; - new->MarginL = script->MarginL; - new->MarginR = script->MarginR; - new->MarginV = script->MarginV; - new->Alignment = script->Alignment; - new->Encoding = script->Encoding; - new->treat_fontname_as_pattern = script->treat_fontname_as_pattern; + new->MarginL = rstyle->MarginL; + new->MarginR = rstyle->MarginR; + new->MarginV = rstyle->MarginV; + new->Alignment = rstyle->Alignment; + new->Encoding = rstyle->Encoding; + new->treat_fontname_as_pattern = rstyle->treat_fontname_as_pattern; // The user style is supposed to be independent of the script resolution. // Treat the user style's values as if they were specified for a script with -- cgit v1.2.3