From: Good Guy Date: Tue, 19 Oct 2021 01:01:26 +0000 (-0600) Subject: Andrew mod to ignore opus extras + title plugin X11 RGBA-FLOAT fix X-Git-Tag: 2021-10~5 X-Git-Url: https://git.cinelerra-gg.org/git/?a=commitdiff_plain;h=561059992b5e4e86217c33109f9946e33f2d3a87;p=goodguy%2Fcinelerra.git Andrew mod to ignore opus extras + title plugin X11 RGBA-FLOAT fix --- diff --git a/cinelerra-5.1/plugins/titler/titler.C b/cinelerra-5.1/plugins/titler/titler.C index 37582050..7655b5a3 100644 --- a/cinelerra-5.1/plugins/titler/titler.C +++ b/cinelerra-5.1/plugins/titler/titler.C @@ -2280,10 +2280,12 @@ TitleTranslateUnit::TitleTranslateUnit(TitleMain *plugin, TitleTranslate *server 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; } \ + if (total_alpha > 0.00000001) { \ + 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; } \ + } \ } \ } \ } diff --git a/cinelerra-5.1/thirdparty/Makefile b/cinelerra-5.1/thirdparty/Makefile index 0bab9fdb..75d8e877 100644 --- a/cinelerra-5.1/thirdparty/Makefile +++ b/cinelerra-5.1/thirdparty/Makefile @@ -242,6 +242,7 @@ opencv.cfg_vars?=$(call cmake_config,.) opencv.cfg_params?= -DBUILD_SHARED_LIBS:BOOL=OFF openexr.cfg_vars?=true; \# openexr.mak_vars?=true; \# +opus.cfg_params?= --disable-extra-programs speech_tools.mak_params?=-j1 tiff.cfg_vars+=LIBS+=" -lpthread" tiff.cfg_params+= --enable-shared=no --disable-zstd $(call if_pkg,libwebp,\