From 86130109374ed36cec6dbebd6474e8f5f1a878a0 Mon Sep 17 00:00:00 2001 From: Desmis Date: Fri, 3 May 2019 18:15:13 +0200 Subject: [PATCH] disabled Soft radius TM --- rtengine/iplocallab.cc | 13 +++++++------ rtgui/locallab.cc | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/rtengine/iplocallab.cc b/rtengine/iplocallab.cc index 6c4c6befb..b30dd2ce1 100644 --- a/rtengine/iplocallab.cc +++ b/rtengine/iplocallab.cc @@ -5225,8 +5225,8 @@ void ImProcFunctions::Lab_Local(int call, int sp, float** shbuffer, LabImage * o JaggedArray bufchro(bfw, bfh); std::unique_ptr bufgb(new LabImage(bfw, bfh)); std::unique_ptr tmp1(new LabImage(bfw, bfh)); - array2D ble(bfw, bfh); - array2D guid(bfw, bfh); + // array2D ble(bfw, bfh); + // array2D guid(bfw, bfh); #ifdef _OPENMP #pragma omp parallel for schedule(dynamic,16) @@ -5282,15 +5282,15 @@ void ImProcFunctions::Lab_Local(int call, int sp, float** shbuffer, LabImage * o for (int x = 0; x < bfw; x++) { buflight[y][x] /= coef; bufchro[y][x] /= coefC; - guid[y][x] = (bufgb->L[y][x]) / 32768.f; - ble[y][x] = (tmp1->L[y][x]) / 32768.f; + // guid[y][x] = (bufgb->L[y][x]) / 32768.f; + // ble[y][x] = (tmp1->L[y][x]) / 32768.f; } } if (lp.softradiustm > 0.f) { - guidedFilter(guid, ble, ble, 0.1f * lp.softradiustm / sk, 0.0001, multiThread, 4); + // guidedFilter(guid, ble, ble, 0.1f * lp.softradiustm / sk, 0.0001, multiThread, 4); } - +/* #ifdef _OPENMP #pragma omp parallel for schedule(dynamic,16) #endif @@ -5300,6 +5300,7 @@ void ImProcFunctions::Lab_Local(int call, int sp, float** shbuffer, LabImage * o tmp1->L[y][x] = LIM01(ble[y][x]) * 32768.f; } } +*/ bufgb.reset(); transit_shapedetect(8, tmp1.get(), nullptr, buflight, bufchro, nullptr, nullptr, nullptr, false, hueref, chromaref, lumaref, sobelref, 0.f, nullptr, lp, original, transformed, cx, cy, sk); } diff --git a/rtgui/locallab.cc b/rtgui/locallab.cc index 054deaf34..eb5f1e9d3 100644 --- a/rtgui/locallab.cc +++ b/rtgui/locallab.cc @@ -796,7 +796,7 @@ Locallab::Locallab(): tmBox->pack_start(*estop); tmBox->pack_start(*scaltm); tmBox->pack_start(*rewei); - tmBox->pack_start(*softradiustm); +// tmBox->pack_start(*softradiustm); tmBox->pack_start(*sensitm); exptonemap->add(*tmBox); exptonemap->setLevel(2);