X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fcanvas.C;h=0d738c808de59187730041c66cfcbb245e841033;hp=85d4e6f51ce453286e7d2636fbf22d00d021d7ce;hb=c279e21fc2394a7908bbd1ba8c79b116fe9fb14a;hpb=a95193c3fd88733d184f2d460eca1fe6ddf8af28 diff --git a/cinelerra-5.1/cinelerra/canvas.C b/cinelerra-5.1/cinelerra/canvas.C index 85d4e6f5..0d738c80 100644 --- a/cinelerra-5.1/cinelerra/canvas.C +++ b/cinelerra-5.1/cinelerra/canvas.C @@ -857,9 +857,11 @@ void Canvas::update_refresh(VideoDevice *device, VFrame *output_frame) if( use_opengl ) best_color_model = BC_RGB888; + int out_w = output_frame->get_w(); + int out_h = output_frame->get_h(); if( refresh_frame && - (refresh_frame->get_w() != device->out_w || - refresh_frame->get_h() != device->out_h || + (refresh_frame->get_w() != out_w || + refresh_frame->get_h() != out_h || refresh_frame->get_color_model() != best_color_model ) ) { // x11 direct render uses BC_BGR8888, use tranfer_from to remap delete refresh_frame; refresh_frame = 0; @@ -867,7 +869,7 @@ void Canvas::update_refresh(VideoDevice *device, VFrame *output_frame) if( !refresh_frame ) { refresh_frame = - new VFrame(device->out_w, device->out_h, best_color_model); + new VFrame(out_w, out_h, best_color_model); } if( use_opengl ) { @@ -879,7 +881,7 @@ void Canvas::update_refresh(VideoDevice *device, VFrame *output_frame) get_canvas()->lock_window(" Canvas::output_refresh"); } else - refresh_frame->transfer_from(output_frame); + refresh_frame->copy_from(output_frame); }