update version, refresh pixmap sz limit

diff --git a/cinelerra-5.1/PKGBUILD b/cinelerra-5.1/PKGBUILD
index f2ac338971d7b30769caa8baf25cc459fdfa78a0..f4aa2c6df238ece0680eadfc0d890a423efa8fcb 100644 (file)
--- a/cinelerra-5.1/PKGBUILD
+++ b/cinelerra-5.1/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: goodguy <lists.cinelerra-cv.org>
 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 bd2c2be0c3fa72d0866c59e03e3c9335fe26ea6f..3f8f36f08440d5363eb525bbf2bf1271efdbfd46 100644 (file)
--- 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 00cf796548eb33a7c3c91f83b54e652819bd9df6..f184e2fe17d23f5757aaa88a4ae39b86c6b31e6e 100644 (file)
--- 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 d60c76250da76b4ce2c68d068bcb93d831e66907..a2d9e7230cb90675b27e4dd40bab79886b3306bd 100644 (file)
--- 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 4ab35e231ddf6aefbe1433481e8deee56b1f5989..69c390aabe0e1d5215db31adf011c5d628f7934b 100644 (file)
--- 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 <cinelerra@lists.cinelerra-cv.org>
 Homepage: http://www.cinelerra-cv.org/
 Build-Depends: nasm, yasm, g++, gdb, build-essential, e2fsprogs,