projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
findobj mode/xlat/scale/rotate, save backup shortcut, undo limit bug, title boundary...
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
colorpicker.C
diff --git
a/cinelerra-5.1/cinelerra/colorpicker.C
b/cinelerra-5.1/cinelerra/colorpicker.C
index a99896dd3325275828dba84113e64cb29364fe0a..1b40fcf0c38f8d00bca6f4b35972422918d71c3c 100644
(file)
--- a/
cinelerra-5.1/cinelerra/colorpicker.C
+++ b/
cinelerra-5.1/cinelerra/colorpicker.C
@@
-578,7
+578,7
@@
PaletteWheelValue::~PaletteWheelValue()
void PaletteWheelValue::create_objects()
{
void PaletteWheelValue::create_objects()
{
- frame = new VFrame(
0, -1, get_w(), get_h(), BC_RGB888, -1
);
+ frame = new VFrame(
get_w(), get_h(), BC_RGB888
);
draw(window->hsv.h, window->hsv.s, window->hsv.v);
flash();
}
draw(window->hsv.h, window->hsv.s, window->hsv.v);
flash();
}
@@
-862,7
+862,7
@@
int PaletteCb::handle_event()
void ColorWindow::update_rgb(float r, float g, float b)
{
{ float y, u, v;
void ColorWindow::update_rgb(float r, float g, float b)
{
{ float y, u, v;
- YUV::rgb_to_yuv_f(r, g, b, y, u, v);
+ YUV::
yuv.
rgb_to_yuv_f(r, g, b, y, u, v);
u += 0.5; v += 0.5;
bclamp(y, 0, 1); yuv.y = y;
bclamp(u, 0, 1); yuv.u = u;
u += 0.5; v += 0.5;
bclamp(y, 0, 1); yuv.y = y;
bclamp(u, 0, 1); yuv.u = u;
@@
-878,7
+878,7
@@
void ColorWindow::update_yuv(float y, float u, float v)
{
u -= 0.5; v -= 0.5;
{ float r, g, b;
{
u -= 0.5; v -= 0.5;
{ float r, g, b;
- YUV::yuv_to_rgb_f(r, g, b, y, u, v);
+ YUV::yuv
.yuv
_to_rgb_f(r, g, b, y, u, v);
bclamp(r, 0, 1); rgb.r = r;
bclamp(g, 0, 1); rgb.g = g;
bclamp(b, 0, 1); rgb.b = b;
bclamp(r, 0, 1); rgb.r = r;
bclamp(g, 0, 1); rgb.g = g;
bclamp(b, 0, 1); rgb.b = b;
@@
-897,7
+897,7
@@
void ColorWindow::update_hsv(float h, float s, float v)
bclamp(g, 0, 1); rgb.g = g;
bclamp(b, 0, 1); rgb.b = b;
float y, u, v;
bclamp(g, 0, 1); rgb.g = g;
bclamp(b, 0, 1); rgb.b = b;
float y, u, v;
- YUV::rgb_to_yuv_f(r, g, b, y, u, v);
+ YUV::
yuv.
rgb_to_yuv_f(r, g, b, y, u, v);
u += 0.5; v += 0.5;
bclamp(y, 0, 1); yuv.y = y;
bclamp(u, 0, 1); yuv.u = u;
u += 0.5; v += 0.5;
bclamp(y, 0, 1); yuv.y = y;
bclamp(u, 0, 1); yuv.u = u;