minor improvements from Andrew
authorGood Guy <good1.2guy@gmail.com>
Sun, 5 Dec 2021 22:41:57 +0000 (15:41 -0700)
committerGood Guy <good1.2guy@gmail.com>
Sun, 5 Dec 2021 22:41:57 +0000 (15:41 -0700)
cinelerra-5.1/cinelerra/vrender.C
cinelerra-5.1/guicast/vframe.C
cinelerra-5.1/thirdparty/src/libbthread-master.patch1 [new file with mode: 0644]

index be3d0c3beee90073fffcfb9bc4d4e5cf0bcad2d0..03b1421da7a69e072b294fb59c6f4a9c40c99c8b 100644 (file)
@@ -70,6 +70,11 @@ VRender::VRender(RenderEngine *renderengine)
        asynchronous = 0;     // render 1 frame at a time
        framerate_counter = 0;
        video_out = 0;
+       track_w = track_h = 0;
+       output_w = output_h = 0;
+       first_frame = 0;
+       output_offset = 0;
+       source_length = 0;
        render_strategy = -1;
 }
 
index 44d7f97e6284a3f5f2c333902cc3dfceef930afe..8e90cca1c6f0cba5013597ed50e11aa9fa56d68a 100644 (file)
@@ -1403,12 +1403,12 @@ int VFrame::get_memory_usage()
 // a (~alpha) transparency, 0x00==solid .. 0xff==transparent
 void VFrame::set_pixel_color(int rgb, int a)
 {
-       pixel_rgb = (~a<<24) | (rgb&0xffffff);
+       pixel_rgb = (~(unsigned int)a<<24) | (rgb&0xffffff);
        int ir = 0xff & (pixel_rgb >> 16);
        int ig = 0xff & (pixel_rgb >> 8);
        int ib = 0xff & (pixel_rgb >> 0);
        YUV::yuv.rgb_to_yuv_8(ir, ig, ib);
-       pixel_yuv = (~a<<24) | (ir<<16) | (ig<<8) | (ib<<0);
+       pixel_yuv = (~(unsigned int)a<<24) | (ir<<16) | (ig<<8) | (ib<<0);
 }
 
 void VFrame::set_stiple(int mask)
diff --git a/cinelerra-5.1/thirdparty/src/libbthread-master.patch1 b/cinelerra-5.1/thirdparty/src/libbthread-master.patch1
new file mode 100644 (file)
index 0000000..f92be13
--- /dev/null
@@ -0,0 +1,9 @@
+--- /dev/null  2021-05-22 06:52:04.572000000 +0300
++++ libbthread-master/Makefile 2021-05-23 15:06:41.348461769 +0300
+@@ -0,0 +1,6 @@
++all:
++      mv pt-test.c pt-test
++      cat `ls *.c` > just-pt.c
++      g++ -c -o jpt.o just-pt.c -I.
++      ar crs jpt.a jpt.o
++