X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Fhistogram_bezier%2Fbistogram.C;h=584a5e6f4d7e6c506bf971b1e9a079dcded3df2d;hp=16a27cb9cfe2d6862c8159866da2f6f38de2f8ab;hb=723142d62d61cde588e961426440f839ca9dcda9;hpb=21c2e6b36d6a96c2f662a89459d607b5a387f4eb

diff --git a/cinelerra-5.1/plugins/histogram_bezier/bistogram.C b/cinelerra-5.1/plugins/histogram_bezier/bistogram.C
index 16a27cb9..584a5e6f 100644
--- a/cinelerra-5.1/plugins/histogram_bezier/bistogram.C
+++ b/cinelerra-5.1/plugins/histogram_bezier/bistogram.C
@@ -35,7 +35,7 @@
 #include "keyframe.h"
 #include "language.h"
 #include "loadbalance.h"
-#include "cicolors.h"
+#include "bccolors.h"
 #include "vframe.h"
 
 
@@ -78,7 +78,7 @@ HistogramMain::~HistogramMain()
 	delete engine;
 }
 
-const char* HistogramMain::plugin_title() { return _("Histogram Bezier"); }
+const char* HistogramMain::plugin_title() { return N_("Histogram Bezier"); }
 int HistogramMain::is_realtime() { return 1; }
 
 
@@ -109,21 +109,16 @@ void HistogramMain::render_gui(void *data)
 
 void HistogramMain::update_gui()
 {
-	if(thread)
-	{
-		thread->window->lock_window("HistogramMain::update_gui");
-		int reconfigure = load_configuration();
-		if(reconfigure)
-		{
-			HistogramWindow *window = (HistogramWindow *)thread->window;
-			window->update(0);
-			if(!config.automatic)
-			{
-				window->update_input();
-			}
-		}
-		thread->window->unlock_window();
+	if( !thread ) return;
+	HistogramWindow *window = (HistogramWindow *)thread->window;
+// points delete in load_configuration,read_data
+	window->lock_window("HistogramMain::update_gui");
+	if( load_configuration() ) {
+		window->update(0);
+		if(!config.automatic)
+			window->update_input();
 	}
+	window->unlock_window();
 }
 
 
@@ -654,7 +649,7 @@ void HistogramUnit::process_package(LoadPackage *package)
 				y = (row[0] << 8) | row[0];
 				u = (row[1] << 8) | row[1];
 				v = (row[2] << 8) | row[2];
-				plugin->yuv.yuv_to_rgb_16(r, g, b, y, u, v);
+				YUV::yuv.yuv_to_rgb_16(r, g, b, y, u, v);
 				HISTOGRAM_TAIL(3)
 				break;
 			case BC_RGBA8888:
@@ -676,7 +671,7 @@ void HistogramUnit::process_package(LoadPackage *package)
 				y = (row[0] << 8) | row[0];
 				u = (row[1] << 8) | row[1];
 				v = (row[2] << 8) | row[2];
-				plugin->yuv.yuv_to_rgb_16(r, g, b, y, u, v);
+				YUV::yuv.yuv_to_rgb_16(r, g, b, y, u, v);
 				HISTOGRAM_TAIL(4)
 				break;
 			case BC_RGB161616:
@@ -691,7 +686,7 @@ void HistogramUnit::process_package(LoadPackage *package)
 				y = row[0];
 				u = row[1];
 				v = row[2];
-				plugin->yuv.yuv_to_rgb_16(r, g, b, y, u, v);
+				YUV::yuv.yuv_to_rgb_16(r, g, b, y, u, v);
 				HISTOGRAM_TAIL(3)
 				break;
 			case BC_RGBA16161616:
@@ -706,7 +701,7 @@ void HistogramUnit::process_package(LoadPackage *package)
 				y = row[0];
 				u = row[1];
 				v = row[2];
-				plugin->yuv.yuv_to_rgb_16(r, g, b, y, u, v);
+				YUV::yuv.yuv_to_rgb_16(r, g, b, y, u, v);
 				HISTOGRAM_TAIL(4)
 				break;
 		}
@@ -757,7 +752,7 @@ void HistogramUnit::process_package(LoadPackage *package)
 				v = row[2]; \
 			} \
  \
-			plugin->yuv.yuv_to_rgb_16(r, g, b, y, u, v); \
+			YUV::yuv.yuv_to_rgb_16(r, g, b, y, u, v); \
  \
 /* Look up in RGB domain */ \
 			r = lookup_r[r]; \
@@ -765,7 +760,7 @@ void HistogramUnit::process_package(LoadPackage *package)
 			b = lookup_b[b]; \
  \
 /* Convert to 16 bit YUV */ \
-			plugin->yuv.rgb_to_yuv_16(r, g, b, y, u, v); \
+			YUV::yuv.rgb_to_yuv_16(r, g, b, y, u, v); \
  \
 			if(max == 0xff) \
 			{ \