X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.1%2Fcinelerra%2Fcolorpicker.C;h=b9db0c76e96a8d4fed7c8ab129e6829b82bbd9ec;hb=564227981f9c1b021445fa0352b75c7670172912;hp=5c43fb93da1c49afe173a8970e5e0710cd26925e;hpb=28600526f736ffd4f104f29495a4bb36497e1ea8;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/colorpicker.C b/cinelerra-5.1/cinelerra/colorpicker.C
index 5c43fb93..b9db0c76 100644
--- a/cinelerra-5.1/cinelerra/colorpicker.C
+++ b/cinelerra-5.1/cinelerra/colorpicker.C
@@ -21,6 +21,7 @@
 
 #include "bcbutton.h"
 #include "bccapture.h"
+#include "bccolors.h"
 #include "bcdisplayinfo.h"
 #include "colorpicker.h"
 #include "condition.h"
@@ -28,15 +29,12 @@
 #include "language.h"
 #include "mutex.h"
 #include "mwindow.h"
-#include "cicolors.h"
+#include "bccolors.h"
 #include "vframe.h"
 
 #include <string.h>
 #include <unistd.h>
 
-#undef MSGQUAL
-#define MSGQUAL "colorpicker"
-
 #define PALETTE_DATA "palette.dat"
 
 ColorPicker::ColorPicker(int do_alpha, const char *title)
@@ -315,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);
@@ -580,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();
 }