fix mask vframe setup, add unshared vframe constructor

[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 a95f6ef381089faefa14f756fad665c6f3e33be1..b9db0c76e96a8d4fed7c8ab129e6829b82bbd9ec 100644 (file)
--- 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();
 }