summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-02-26 20:49:15 +0100
committerwm4 <wm4@nowhere>2015-02-26 20:49:15 +0100
commit230f855fd3a80a6acfefe753b778b422191be26f (patch)
tree14efa85841e682730069ec84f16cf0063eb68d90
parent4f43ff2ca3bed41dfd122d1a34e88c08c06ca795 (diff)
downloadlibass-230f855fd3a80a6acfefe753b778b422191be26f.tar.bz2
libass-230f855fd3a80a6acfefe753b778b422191be26f.tar.xz
Change what fields are overridden with style override
"Bold" should obviously be taken from the script's style, like it's done with StrikeOut and Underline. treat_fontname_as_pattern is specific to the font, and thus should be taken from the same style as the font (the override style).
-rw-r--r--libass/ass_render.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libass/ass_render.c b/libass/ass_render.c
index 2a36647..3e54710 100644
--- a/libass/ass_render.c
+++ b/libass/ass_render.c
@@ -778,6 +778,7 @@ static ASS_Style *handle_selective_style_overrides(ASS_Renderer *render_priv,
// script's style that are deemed necessary.
*new = render_priv->user_override_style;
+ new->Bold = rstyle->Bold;
new->StrikeOut = rstyle->StrikeOut;
new->Underline = rstyle->Underline;
new->Angle = rstyle->Angle;
@@ -787,7 +788,6 @@ static ASS_Style *handle_selective_style_overrides(ASS_Renderer *render_priv,
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