diff options
author | wm4 <wm4@nowhere> | 2015-03-16 20:58:03 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2015-03-16 20:58:03 +0100 |
commit | 50799d10fac81f25f2da8353d0394875101ee220 (patch) | |
tree | 78e5b38d6f7cf8a847398e692ea062ec5e5ff23d | |
parent | 5c3ed3e6feb6e15179d1bc9599cb15150fa07bff (diff) | |
download | libass-50799d10fac81f25f2da8353d0394875101ee220.tar.bz2 libass-50799d10fac81f25f2da8353d0394875101ee220.tar.xz |
Reorder functions
Just move the *_pos ones about the variants without this postfix.
-rw-r--r-- | libass/ass_render.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/libass/ass_render.c b/libass/ass_render.c index 6b5ff853..97dc1192 100644 --- a/libass/ass_render.c +++ b/libass/ass_render.c @@ -238,15 +238,20 @@ static ASS_Image *my_draw_bitmap(unsigned char *bitmap, int bitmap_w, /** * \brief Mapping between script and screen coordinates */ +static double x2scr_pos(ASS_Renderer *render_priv, double x) +{ + return x * render_priv->orig_width / render_priv->font_scale_x / render_priv->track->PlayResX + + render_priv->settings.left_margin; +} static double x2scr(ASS_Renderer *render_priv, double x) { return x * render_priv->orig_width_nocrop / render_priv->font_scale_x / render_priv->track->PlayResX + FFMAX(render_priv->settings.left_margin, 0); } -static double x2scr_pos(ASS_Renderer *render_priv, double x) +static double x2scr_pos_scaled(ASS_Renderer *render_priv, double x) { - return x * render_priv->orig_width / render_priv->font_scale_x / render_priv->track->PlayResX + + return x * render_priv->orig_width / render_priv->track->PlayResX + render_priv->settings.left_margin; } static double x2scr_scaled(ASS_Renderer *render_priv, double x) @@ -255,25 +260,20 @@ static double x2scr_scaled(ASS_Renderer *render_priv, double x) render_priv->track->PlayResX + FFMAX(render_priv->settings.left_margin, 0); } -static double x2scr_pos_scaled(ASS_Renderer *render_priv, double x) -{ - return x * render_priv->orig_width / render_priv->track->PlayResX + - render_priv->settings.left_margin; -} /** * \brief Mapping between script and screen coordinates */ +static double y2scr_pos(ASS_Renderer *render_priv, double y) +{ + return y * render_priv->orig_height / render_priv->track->PlayResY + + render_priv->settings.top_margin; +} static double y2scr(ASS_Renderer *render_priv, double y) { return y * render_priv->orig_height_nocrop / render_priv->track->PlayResY + FFMAX(render_priv->settings.top_margin, 0); } -static double y2scr_pos(ASS_Renderer *render_priv, double y) -{ - return y * render_priv->orig_height / render_priv->track->PlayResY + - render_priv->settings.top_margin; -} // the same for toptitles static double y2scr_top(ASS_Renderer *render_priv, double y) |