fade in / out in titler fix from freelancer

diff --git a/cinelerra-5.1/plugins/titler/titler.C b/cinelerra-5.1/plugins/titler/titler.C
index 06fb7938278aa654505471e5041683b4d25ab0c7..37582050c4146dc447e451de2895aca71a9e32f3 100644 (file)
--- a/cinelerra-5.1/plugins/titler/titler.C
+++ b/cinelerra-5.1/plugins/titler/titler.C
@@ -594,7 +594,6 @@ void TitleUnit::draw_frame(int mode, VFrame *dst, VFrame *src, int x, int y)
        int color = chr->color, max = 0xff;
        int alpha = chr->alpha * chr->fade;
        int ofs = BC_CModels::is_yuv(dst->get_color_model()) ? 0x80 : 0x00;
-
        switch( mode ) {
        case DRAW_ALPHA: {
                while( y_inp < inp_h && y_out < out_h ) {
@@ -2155,7 +2154,6 @@ int TitleMain::draw_underline(VFrame *mask, int alpha)
 
 void TitleMain::draw_overlay()
 {
-//printf("TitleMain::draw_overlay 1\n");
         fade = 1;
         if( !EQUIV(config.fade_in, 0) ) {
                int64_t plugin_start = get_startproject();
@@ -2275,11 +2273,16 @@ TitleTranslateUnit::TitleTranslateUnit(TitleMain *plugin, TitleTranslate *server
                        type in_r = (cp00[0]*a00 + cp01[0]*a01 + cp10[0]*a10 + cp11[0]*a11)*s + r; \
                        type in_g = (cp00[1]*a00 + cp01[1]*a01 + cp10[1]*a10 + cp11[1]*a11)*s + r; \
                        type in_b = (cp00[2]*a00 + cp01[2]*a01 + cp10[2]*a10 + cp11[2]*a11)*s + r; \
-                       type a = in_a*plugin->fade, b = max - a, px; \
-                       /*if( comps == 4 ) { b = (b * op[3]) / max; }*/ \
-                       px = *op;  *op++ = (a*in_r + b*px) / max; \
-                       px = *op;  *op++ = (a*(in_g-ofs) + b*(px-ofs)) / max + ofs; \
-                       px = *op;  *op++ = (a*(in_b-ofs) + b*(px-ofs)) / max + ofs; \
+                       type a = in_a*plugin->fade, px; \
+                       type b ; \
+                       double total_alpha, double_b; \
+                       if ( comps == 4 ) { b = *(op+3); } \
+                       else b = max - a; \
+                       double_b = (1.0 * b * (max - a)/(max*1.0)); \
+                       total_alpha = a + double_b; \
+                       px = *op;  *op++ = (a*in_r + double_b*px) / total_alpha; \
+                       px = *op;  *op++ = (a*(in_g-ofs) + double_b*(px-ofs)) / total_alpha + ofs; \
+                       px = *op;  *op++ = (a*(in_b-ofs) + double_b*(px-ofs)) / total_alpha + ofs; \
                        if( comps == 4 ) { b = *op;  *op++ = a + b - a*b / max; } \
                } \
        } \