X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fscopewindow.C;h=4713b95d8f8ad0b663bb7466afd7e4d37127e046;hb=803cf48f8f7ee246eb5473e55fc2125e8b398250;hp=fb3c01980491b9119197de8d4fb6488a7a3b2a9b;hpb=21c2e6b36d6a96c2f662a89459d607b5a387f4eb;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/cinelerra/scopewindow.C b/cinelerra-5.1/cinelerra/scopewindow.C index fb3c0198..4713b95d 100644 --- a/cinelerra-5.1/cinelerra/scopewindow.C +++ b/cinelerra-5.1/cinelerra/scopewindow.C @@ -19,7 +19,7 @@ */ #include "bcsignals.h" -#include "cicolors.h" +#include "bccolors.h" #include "clip.h" #include "cursors.h" #include "language.h" @@ -193,7 +193,7 @@ void ScopeUnit::draw_point(unsigned char **rows, u_in, \ v_in) \ { \ - yuv.yuv_to_rgb_f(r, g, b, (float)y_in / 255, (float)(u_in - 0x80) / 255, (float)(v_in - 0x80) / 255); \ + YUV::yuv.yuv_to_rgb_f(r, g, b, (float)y_in / 255, (float)(u_in - 0x80) / 255, (float)(v_in - 0x80) / 255); \ HSV::rgb_to_hsv(r, \ g, \ b, \ @@ -209,8 +209,6 @@ void ScopeUnit::process_package(LoadPackage *package) { ScopePackage *pkg = (ScopePackage*)package; - - YUV yuv; float r, g, b; float h, s, v; int x, y;