X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fcolorpicker.C;h=1b40fcf0c38f8d00bca6f4b35972422918d71c3c;hb=c279e21fc2394a7908bbd1ba8c79b116fe9fb14a;hp=a95f6ef381089faefa14f756fad665c6f3e33be1;hpb=9d832a1fff11b11aaa1108c460690ed05e2bdc05;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/colorpicker.C b/cinelerra-5.1/cinelerra/colorpicker.C
index a95f6ef3..1b40fcf0 100644
--- a/cinelerra-5.1/cinelerra/colorpicker.C
+++ b/cinelerra-5.1/cinelerra/colorpicker.C
@@ -35,9 +35,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#undef MSGQUAL
-#define MSGQUAL "colorpicker"
-
 #define PALETTE_DATA "palette.dat"
 
 ColorPicker::ColorPicker(int do_alpha, const char *title)
@@ -316,7 +313,7 @@ int ColorWindow::handle_event()
 void ColorWindow::get_screen_sample()
 {
 	int cx, cy;
-	get_abs_cursor_xy(cx, cy);
+	get_abs_cursor(cx, cy);
 	BC_Capture capture_bitmap(1, 1, 0);
 	VFrame vframe(1,1,BC_RGB888);
 	capture_bitmap.capture_frame(&vframe, cx,cy);
@@ -581,7 +578,7 @@ PaletteWheelValue::~PaletteWheelValue()
 
 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();
 }
@@ -865,7 +862,7 @@ int PaletteCb::handle_event()
 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;
@@ -881,7 +878,7 @@ void ColorWindow::update_yuv(float y, float u, float v)
 {
 	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;
@@ -900,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;
-	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;