fix outer color setup for yuv in gradient, fix last_xy update in sketcher grab_event

diff --git a/cinelerra-5.1/plugins/gradient/gradient.C b/cinelerra-5.1/plugins/gradient/gradient.C
index fa001041c975768c42833924f3d40a951f4f2193..6ceb8b1bfc81dab51b85b66d79807f14a5b1638c 100644 (file)
--- a/cinelerra-5.1/plugins/gradient/gradient.C
+++ b/cinelerra-5.1/plugins/gradient/gradient.C
@@ -1045,9 +1045,9 @@ void GradientUnit::process_package(LoadPackage *package)
                int out1, out2, out3, out4;
                YUV::yuv.rgb_to_yuv_8(in_r,in_g,in_b, in1,in2,in3);
                in4 = plugin->config.in_a;
                int out1, out2, out3, out4;
                YUV::yuv.rgb_to_yuv_8(in_r,in_g,in_b, in1,in2,in3);
                in4 = plugin->config.in_a;

-               int out_r = plugin->config.in_r;
-               int out_g = plugin->config.in_g;
-               int out_b = plugin->config.in_b;
+               int out_r = plugin->config.out_r;
+               int out_g = plugin->config.out_g;
+               int out_b = plugin->config.out_b;

                YUV::yuv.rgb_to_yuv_8(out_r,out_g,out_b, out1,out2,out3);
                out4 = plugin->config.out_a;
                CREATE_GRADIENT(unsigned char, int, 3, 0xff)
                YUV::yuv.rgb_to_yuv_8(out_r,out_g,out_b, out1,out2,out3);
                out4 = plugin->config.out_a;
                CREATE_GRADIENT(unsigned char, int, 3, 0xff)


@@ -1061,9 +1061,9 @@ void GradientUnit::process_package(LoadPackage *package)
                int out1, out2, out3, out4;
                YUV::yuv.rgb_to_yuv_8(in_r,in_g,in_b, in1,in2,in3);
                in4 = plugin->config.in_a;
                int out1, out2, out3, out4;
                YUV::yuv.rgb_to_yuv_8(in_r,in_g,in_b, in1,in2,in3);
                in4 = plugin->config.in_a;

-               int out_r = plugin->config.in_r;
-               int out_g = plugin->config.in_g;
-               int out_b = plugin->config.in_b;
+               int out_r = plugin->config.out_r;
+               int out_g = plugin->config.out_g;
+               int out_b = plugin->config.out_b;

                YUV::yuv.rgb_to_yuv_8(out_r,out_g,out_b, out1,out2,out3);
                out4 = plugin->config.out_a;
                CREATE_GRADIENT(unsigned char, int, 4, 0xff)
                YUV::yuv.rgb_to_yuv_8(out_r,out_g,out_b, out1,out2,out3);
                out4 = plugin->config.out_a;
                CREATE_GRADIENT(unsigned char, int, 4, 0xff)

diff --git a/cinelerra-5.1/plugins/sketcher/sketcherwindow.C b/cinelerra-5.1/plugins/sketcher/sketcherwindow.C
index dd917e4b48cb97ee8bccb4de0826ddf94b817280..2235260cb80ed51f5f5f05348520756568207a3d 100644 (file)
--- a/cinelerra-5.1/plugins/sketcher/sketcherwindow.C
+++ b/cinelerra-5.1/plugins/sketcher/sketcherwindow.C
@@ -472,7 +472,7 @@ int SketcherWindow::grab_event(XEvent *event)
                if( grab_cursor_motion() )
                        pending_config = 1;
                if( pending_config ) {
                if( grab_cursor_motion() )
                        pending_config = 1;
                if( pending_config ) {

-                       last_x = output_x;  last_y = output_y;
+                       last_x = track_x;  last_y = track_y;

                        send_configure_change();
                }
        }
                        send_configure_change();
                }
        }