projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
batchrender hang on close, apply pref saves defaults, overwrite/splice tweaks, specif...
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
scopewindow.C
diff --git
a/cinelerra-5.1/cinelerra/scopewindow.C
b/cinelerra-5.1/cinelerra/scopewindow.C
index fb3c01980491b9119197de8d4fb6488a7a3b2a9b..4713b95d8f8ad0b663bb7466afd7e4d37127e046 100644
(file)
--- a/
cinelerra-5.1/cinelerra/scopewindow.C
+++ b/
cinelerra-5.1/cinelerra/scopewindow.C
@@
-19,7
+19,7
@@
*/
#include "bcsignals.h"
*/
#include "bcsignals.h"
-#include "
ci
colors.h"
+#include "
bc
colors.h"
#include "clip.h"
#include "cursors.h"
#include "language.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) \
{ \
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, \
HSV::rgb_to_hsv(r, \
g, \
b, \
@@
-209,8
+209,6
@@
void ScopeUnit::process_package(LoadPackage *package)
{
ScopePackage *pkg = (ScopePackage*)package;
{
ScopePackage *pkg = (ScopePackage*)package;
-
- YUV yuv;
float r, g, b;
float h, s, v;
int x, y;
float r, g, b;
float h, s, v;
int x, y;