fix boxblur segv, tweak guicast Makefile for 3rd party includes, fix title drag box...

diff --git a/cinelerra-5.1/cinelerra/boxblur.C b/cinelerra-5.1/cinelerra/boxblur.C
index 4b52221382b0d4e2d48345490e35673a3f8d41f1..d0c00c0904a13c5fa8f62dbdbc4d7d9a2d03db2a 100644 (file)
--- a/cinelerra-5.1/cinelerra/boxblur.C
+++ b/cinelerra-5.1/cinelerra/boxblur.C
@@ -5,10 +5,11 @@ template<class dst_t, class src_t> static inline
 void blurt(dst_t *dst, int dst_step, src_t *src, int src_step,
                int len, int radius, float s)
 {
 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;
        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<radius; ++x )
                sum += src[x*src_step]<<1;
 
        for( x=0; x<radius; ++x )
                sum += src[x*src_step]<<1;

diff --git a/cinelerra-5.1/guicast/Makefile b/cinelerra-5.1/guicast/Makefile
index 201c5a405fd116cdad5ea43fbba72f925e118e62..04bc87a08a200b92e884c925e6f2f148d23b3c60 100644 (file)
--- a/cinelerra-5.1/guicast/Makefile
+++ b/cinelerra-5.1/guicast/Makefile
@@ -87,7 +87,7 @@ OUTPUT = $(OBJDIR)/libguicast.a
 UTILS = $(OBJDIR)/bootstrap $(OBJDIR)/pngtoh $(OBJDIR)/pngtoraw
 BCXFER = xfer/$(OBJDIR)/xfer.stamp
 
 UTILS = $(OBJDIR)/bootstrap $(OBJDIR)/pngtoh $(OBJDIR)/pngtoraw
 BCXFER = xfer/$(OBJDIR)/xfer.stamp
 

-CFLAGS += -I/usr/include/freetype2
+CFLAGS += $(static_incs)

 
 $(shell echo $(CFLAGS) > $(OBJDIR)/c_flags)
 $(shell echo $(OBJS) > $(OBJDIR)/objs)
 
 $(shell echo $(CFLAGS) > $(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 9b9ebb6432d119546ee869b761eb98f2083ac17e..c6db737b2a029ec88b9416f90371143db868bbff 100644 (file)
--- 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_x;
        delete title_y;
        delete title_w;

-       delete title_y;
+       delete title_h;

 }
 
 void TitleWindow::create_objects()
 }
 
 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);
        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);
        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 e343f39a03524559bd38211786ac1ed3b0427be2..0be2898e8b3692cdaca17f3339d6326ba8f603c8 100644 (file)
--- 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)\
 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)
 twolame.cfg_params?=--enable-shared=no
 x264.cfg_params?= --enable-static --enable-pic
 x265.cfg_vars?=$(call cmake_config,source)