From cec4b4235b1b164d1afd583169c4dbde1f9bf784 Mon Sep 17 00:00:00 2001 From: Good Guy Date: Sun, 5 Apr 2020 20:27:31 -0600 Subject: [PATCH] fix boxblur segv, tweak guicast Makefile for 3rd party includes, fix title drag box update, fix titler window cleanup goof --- cinelerra-5.1/cinelerra/boxblur.C | 5 +++-- cinelerra-5.1/guicast/Makefile | 2 +- cinelerra-5.1/plugins/titler/titlerwindow.C | 6 +++++- cinelerra-5.1/thirdparty/Makefile | 3 ++- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/cinelerra-5.1/cinelerra/boxblur.C b/cinelerra-5.1/cinelerra/boxblur.C index 4b522213..d0c00c09 100644 --- a/cinelerra-5.1/cinelerra/boxblur.C +++ b/cinelerra-5.1/cinelerra/boxblur.C @@ -5,10 +5,11 @@ template static inline void blurt(dst_t *dst, int dst_step, src_t *src, int src_step, int len, int radius, float s) { - if( radius > len ) radius = len; + int n = len/2-1; + if( radius > n ) radius = n; const int length = radius*2 + 1; const int inv = s * ((1<<16) + length/2)/length; - int x, n, sum = src[radius*src_step]; + int x, sum = src[radius*src_step]; for( x=0; x $(OBJDIR)/c_flags) $(shell echo $(OBJS) > $(OBJDIR)/objs) diff --git a/cinelerra-5.1/plugins/titler/titlerwindow.C b/cinelerra-5.1/plugins/titler/titlerwindow.C index 9b9ebb64..c6db737b 100644 --- a/cinelerra-5.1/plugins/titler/titlerwindow.C +++ b/cinelerra-5.1/plugins/titler/titlerwindow.C @@ -140,7 +140,7 @@ TitleWindow::~TitleWindow() delete title_x; delete title_y; delete title_w; - delete title_y; + delete title_h; } void TitleWindow::create_objects() @@ -574,6 +574,10 @@ void TitleWindow::update_gui() title_y->update((int64_t)client->config.title_y); title_w->update((int64_t)client->config.title_w); title_h->update((int64_t)client->config.title_h); + drag->drag_x = client->config.title_x; + drag->drag_y = client->config.title_y; + drag->drag_w = client->config.title_w; + drag->drag_h = client->config.title_h; italic->update(client->config.style & BC_FONT_ITALIC); bold->update(client->config.style & BC_FONT_BOLD); alias->update(client->config.style & FONT_ALIAS); diff --git a/cinelerra-5.1/thirdparty/Makefile b/cinelerra-5.1/thirdparty/Makefile index e343f39a..0be2898e 100644 --- a/cinelerra-5.1/thirdparty/Makefile +++ b/cinelerra-5.1/thirdparty/Makefile @@ -246,7 +246,8 @@ speech_tools.mak_params?=-j1 tiff.cfg_vars+=LIBS+=" -lpthread" tiff.cfg_params+= --enable-shared=no --disable-zstd $(call if_pkg,libwebp,\ --with-webp-include-dir=$(call pkg_incl,libwebp)\ - --with-webp-lib-dir=$(call pkg_libs,libwebp)) + --with-webp-lib-dir=$(call pkg_libs,libwebp))\ + $(call if_npkg,libwebp,--disable-webp) twolame.cfg_params?=--enable-shared=no x264.cfg_params?= --enable-static --enable-pic x265.cfg_vars?=$(call cmake_config,source) -- 2.26.2