From 439d655274ef8385d20db9b75bbff63b4300ec7b Mon Sep 17 00:00:00 2001 From: Good Guy Date: Sun, 30 Oct 2016 13:43:05 -0600 Subject: [PATCH] update version, refresh pixmap sz limit --- cinelerra-5.1/PKGBUILD | 2 +- cinelerra-5.1/cinelerra.spec | 2 +- cinelerra-5.1/cinelerra/resourcepixmap.C | 7 +++++-- cinelerra-5.1/debian/changelog | 2 +- cinelerra-5.1/debian/control | 2 +- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/cinelerra-5.1/PKGBUILD b/cinelerra-5.1/PKGBUILD index f2ac3389..f4aa2c6d 100644 --- a/cinelerra-5.1/PKGBUILD +++ b/cinelerra-5.1/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: goodguy pkgname=cin pkgver=5.1 -pkgrel=20161002 +pkgrel=20161030 pkgdesc="Cinelerra git://git.cinelerra-cv.org/goodguy/cinelerra.git ($pkgrel)" arch=('x86_64') url="http://www.cinelerra-cv.org" diff --git a/cinelerra-5.1/cinelerra.spec b/cinelerra-5.1/cinelerra.spec index bd2c2be0..3f8f36f0 100644 --- a/cinelerra-5.1/cinelerra.spec +++ b/cinelerra-5.1/cinelerra.spec @@ -1,4 +1,4 @@ -%define ver 20161002 +%define ver 20161030 Summary: Multimedia Editing and construction Name: cinelerra Version: 5.1 diff --git a/cinelerra-5.1/cinelerra/resourcepixmap.C b/cinelerra-5.1/cinelerra/resourcepixmap.C index 00cf7965..f184e2fe 100644 --- a/cinelerra-5.1/cinelerra/resourcepixmap.C +++ b/cinelerra-5.1/cinelerra/resourcepixmap.C @@ -852,8 +852,11 @@ void ResourcePixmap::draw_video_resource(TrackCanvas *canvas, int64_t picon_h = edit->picon_h(); -// Don't draw video if picon is empty or bigger than edit - if( picon_w <= 0 || picon_w > edit_w ) return; +// if( picon_w <= 0 || picon_w > edit_w ) return; +// Don't draw video if picon is empty, or edit only hairline + if( picon_w < 1 || edit_w < 2 ) return; +// or bigger than edit and fills at less than 1.5 percent timeline + if( picon_w > edit_w && edit_w < canvas->get_w()/64 ) return; // pixels spanned by a frame double frame_w = edit->frame_w(); diff --git a/cinelerra-5.1/debian/changelog b/cinelerra-5.1/debian/changelog index d60c7625..a2d9e723 100644 --- a/cinelerra-5.1/debian/changelog +++ b/cinelerra-5.1/debian/changelog @@ -1,4 +1,4 @@ -cin (1:5.1.20161002) unstable; urgency=low +cin (1:5.1.20161030) unstable; urgency=low [ guy goode ] diff --git a/cinelerra-5.1/debian/control b/cinelerra-5.1/debian/control index 4ab35e23..69c390aa 100644 --- a/cinelerra-5.1/debian/control +++ b/cinelerra-5.1/debian/control @@ -1,7 +1,7 @@ Source: cin Section: video Priority: optional -Standards-Version: 5.1.20161002 +Standards-Version: 5.1.20161030 Maintainer: mailing list Homepage: http://www.cinelerra-cv.org/ Build-Depends: nasm, yasm, g++, gdb, build-essential, e2fsprogs, -- 2.26.2