histogram fix, use_thumbnails fix, zoom popup width tweak, cut/paste for mixer apply...

[goodguy/cinelerra.git] / cinelerra-5.1 / plugins / histogram / histogram.C

diff --git a/cinelerra-5.1/plugins/histogram/histogram.C b/cinelerra-5.1/plugins/histogram/histogram.C
index 33091111dbbb05aa5217effc5d425784796c064c..1d24200135994d351b7620d087c85760f0b58b0e 100644 (file)
--- a/cinelerra-5.1/plugins/histogram/histogram.C
+++ b/cinelerra-5.1/plugins/histogram/histogram.C
@@ -280,7 +280,8 @@ float HistogramMain::calculate_level(float input,
 // Scale to input range
        if(!EQUIV(config.high_input[mode], config.low_input[mode]))
        {
-               output = (input - config.low_input[mode]) /
+               output = input < config.low_input[mode] ? 0 :
+                   (input - config.low_input[mode]) /
                        (config.high_input[mode] - config.low_input[mode]);
        }
        else
@@ -321,11 +322,13 @@ float HistogramMain::calculate_level(float input,
 
 void HistogramMain::calculate_histogram(VFrame *data, int do_value)
 {
-
-       if(!engine) engine = new HistogramEngine(this,
-               get_project_smp() + 1,
-               get_project_smp() + 1);
-
+       if( !engine )
+       {
+               int cpus = data->get_w() * data->get_h() / 0x80000 + 2;
+               int smps = get_project_smp();
+               if( cpus > smps ) cpus = smps;
+               engine = new HistogramEngine(this, cpus, cpus);
+       }
        if(!accum[0])
        {
                for(int i = 0; i < HISTOGRAM_MODES; i++)
@@ -446,11 +449,15 @@ int HistogramMain::process_buffer(VFrame *frame,
 // Apply histogram in hardware
        if(use_opengl) return run_opengl();
 
-       if(!engine) engine = new HistogramEngine(this,
-               get_project_smp() + 1,
-               get_project_smp() + 1);
        this->input = frame;
        this->output = frame;
+       if( !engine )
+       {
+               int cpus = input->get_w() * input->get_h() / 0x80000 + 2;
+               int smps = get_project_smp();
+               if( cpus > smps ) cpus = smps;
+               engine = new HistogramEngine(this, cpus, cpus);
+       }
 // Always plot to set the curves if automatic
        if(config.plot || config.automatic) send_render_gui(frame);