From 595ab0f2930371826acdf604313302ee97e4a233 Mon Sep 17 00:00:00 2001 From: Oleg Oshmyan Date: Mon, 19 Oct 2020 02:02:08 +0300 Subject: Drop the now-useless, previously-broken first_pos_x --- libass/ass_render.c | 5 ++--- libass/ass_render.h | 2 -- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/libass/ass_render.c b/libass/ass_render.c index 001f1b0..a324935 100644 --- a/libass/ass_render.c +++ b/libass/ass_render.c @@ -786,7 +786,7 @@ static ASS_Image *render_text(ASS_Renderer *render_priv) continue; if ((info->effect_type == EF_KARAOKE_KO) - && (info->effect_timing <= info->first_pos_x)) { + && (info->effect_timing <= 0)) { // do nothing } else { tail = @@ -802,7 +802,7 @@ static ASS_Image *render_text(ASS_Renderer *render_priv) if ((info->effect_type == EF_KARAOKE) || (info->effect_type == EF_KARAOKE_KO)) { - if (info->effect_timing > info->first_pos_x) + if (info->effect_timing > 0) tail = render_glyph(render_priv, info->bm, info->x, info->y, info->c[0], 0, 1000000, tail, @@ -2329,7 +2329,6 @@ static void render_and_combine_glyphs(ASS_Renderer *render_priv, memcpy(¤t_info->c, &info->c, sizeof(info->c)); current_info->effect_type = info->effect_type; current_info->effect_timing = info->effect_timing; - current_info->first_pos_x = info->bbox.x_max >> 6; FilterDesc *filter = ¤t_info->filter; filter->flags = flags; diff --git a/libass/ass_render.h b/libass/ass_render.h index 5208f04..eb4124e 100644 --- a/libass/ass_render.h +++ b/libass/ass_render.h @@ -103,8 +103,6 @@ typedef struct { // after process_karaoke_effects: distance in pixels from the glyph origin. // part of the glyph to the left of it is displayed in a different color. - int first_pos_x; - size_t bitmap_count, max_bitmap_count; BitmapRef *bitmaps; -- cgit v1.2.3