X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Fthreshold%2Fhistogramengine.C;fp=cinelerra-5.1%2Fplugins%2Fthreshold%2Fhistogramengine.C;h=bdfab86c7800991648449a51545bb4ead923057e;hb=f3adc7285af86851913b48592a8c4fdfcdcdf8b6;hp=e7c69ff0a9a3d5cbda95450eb1f19f43707aeeb7;hpb=00596b369bc10eb373260e23574180dc88b06c5e;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/plugins/threshold/histogramengine.C b/cinelerra-5.1/plugins/threshold/histogramengine.C index e7c69ff0..bdfab86c 100644 --- a/cinelerra-5.1/plugins/threshold/histogramengine.C +++ b/cinelerra-5.1/plugins/threshold/histogramengine.C @@ -19,8 +19,8 @@ * */ -#include "histogramengine.h" #include "bccolors.h" +#include "histogramengine.h" #include "vframe.h" #include @@ -116,7 +116,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]; - server->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: @@ -138,7 +138,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]; - server->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: @@ -153,7 +153,7 @@ void HistogramUnit::process_package(LoadPackage *package) y = row[0]; u = row[1]; v = row[2]; - server->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: @@ -168,7 +168,7 @@ void HistogramUnit::process_package(LoadPackage *package) y = row[0]; u = row[1]; v = row[2]; - server->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; } @@ -184,7 +184,6 @@ void HistogramUnit::process_package(LoadPackage *package) HistogramEngine::HistogramEngine(int total_clients, int total_packages) : LoadServer(total_clients, total_packages) { - yuv = new YUV; data = 0; for(int i = 0; i < 5; i++) accum[i] = new int64_t[HISTOGRAM_RANGE]; @@ -192,7 +191,6 @@ HistogramEngine::HistogramEngine(int total_clients, int total_packages) HistogramEngine::~HistogramEngine() { - delete yuv; for(int i = 0; i < 5; i++) delete [] accum[i]; }