From 2f3ed2f5e36e645f02024e063a830c34002fe648 Mon Sep 17 00:00:00 2001 From: Oleg Oshmyan Date: Thu, 1 May 2014 02:47:43 +0100 Subject: parse_tag: split \fscx, \fscy, \fsc --- libass/ass_parse.c | 43 ++++++++++++++++++++----------------------- 1 file changed, 20 insertions(+), 23 deletions(-) diff --git a/libass/ass_parse.c b/libass/ass_parse.c index d0d1972..aa4a206 100644 --- a/libass/ass_parse.c +++ b/libass/ass_parse.c @@ -321,30 +321,27 @@ char *parse_tag(ASS_Renderer *render_priv, char *p, double pwr) } else render_priv->state.blur = 0.0; // ASS standard tags - } else if (mystrcmp(&p, "fsc")) { - char tp = *p++; + } else if (mystrcmp(&p, "fscx")) { double val; - if (tp == 'x') { - if (mystrtod(&p, &val)) { - val /= 100; - val = render_priv->state.scale_x * (1 - pwr) + val * pwr; - val = (val < 0) ? 0 : val; - } else - val = render_priv->state.style->ScaleX; - render_priv->state.scale_x = val; - } else if (tp == 'y') { - if (mystrtod(&p, &val)) { - val /= 100; - val = render_priv->state.scale_y * (1 - pwr) + val * pwr; - val = (val < 0) ? 0 : val; - } else - val = render_priv->state.style->ScaleY; - render_priv->state.scale_y = val; - } else { - --p; - render_priv->state.scale_x = render_priv->state.style->ScaleX; - render_priv->state.scale_y = render_priv->state.style->ScaleY; - } + if (mystrtod(&p, &val)) { + val /= 100; + val = render_priv->state.scale_x * (1 - pwr) + val * pwr; + val = (val < 0) ? 0 : val; + } else + val = render_priv->state.style->ScaleX; + render_priv->state.scale_x = val; + } else if (mystrcmp(&p, "fscy")) { + double val; + if (mystrtod(&p, &val)) { + val /= 100; + val = render_priv->state.scale_y * (1 - pwr) + val * pwr; + val = (val < 0) ? 0 : val; + } else + val = render_priv->state.style->ScaleY; + render_priv->state.scale_y = val; + } else if (mystrcmp(&p, "fsc")) { + render_priv->state.scale_x = render_priv->state.style->ScaleX; + render_priv->state.scale_y = render_priv->state.style->ScaleY; } else if (mystrcmp(&p, "fsp")) { double val; if (mystrtod(&p, &val)) -- cgit v1.2.3