From 6037d1d6ee60c197a4163e89f5ceeda5f1d042e8 Mon Sep 17 00:00:00 2001 From: eugeni Date: Wed, 16 Aug 2006 00:54:59 +0000 Subject: Fix wrong handling of transparency in \fad(\fade). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19412 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libass/ass_render.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) (limited to 'libass') diff --git a/libass/ass_render.c b/libass/ass_render.c index 50135de00c..327f886b19 100644 --- a/libass/ass_render.c +++ b/libass/ass_render.c @@ -570,6 +570,17 @@ static void change_alpha(uint32_t* var, uint32_t new, double pwr) *var = (_r(*var) << 24) + (_g(*var) << 16) + (_b(*var) << 8) + (_a(*var) * (1 - pwr) + _a(new) * pwr); } +/** + * \brief Multiply two alpha values + * \param a first value + * \param b second value + * \return result of multiplication + * Parameters and result are limited by 0xFF. + */ +static uint32_t mult_alpha(uint32_t a, uint32_t b) +{ + return 0xFF - (0xFF - a) * (0xFF - b) / 0xFF; +} /** * \brief Calculate alpha value by piecewise linear function @@ -596,10 +607,10 @@ static void interpolate_alpha(long long now, } - change_alpha(&render_context.c1, a, 1.); - change_alpha(&render_context.c2, a, 1.); - change_alpha(&render_context.c3, a, 1.); - change_alpha(&render_context.c4, a, 1.); + change_alpha(&render_context.c1, mult_alpha(_a(render_context.c1), a), 1.); + change_alpha(&render_context.c2, mult_alpha(_a(render_context.c2), a), 1.); + change_alpha(&render_context.c3, mult_alpha(_a(render_context.c3), a), 1.); + change_alpha(&render_context.c4, mult_alpha(_a(render_context.c4), a), 1.); } /** -- cgit v1.2.3