make sure that dehaze doesn't trigger Fattal tone mapping

(bad interaction due to sloppy rebasing)
This commit is contained in:
Alberto Griggio 2018-10-10 17:08:36 +02:00
parent 14ac4babec
commit 75964dfd8b
3 changed files with 6 additions and 6 deletions

View File

@ -1201,9 +1201,7 @@ IImage8* Thumbnail::processImage (const procparams::ProcParams& params, eSensorT
ipf.firstAnalysis (baseImg, params, hist16);
ipf.dehaze(baseImg);
if (params.fattal.enabled) {
ipf.ToneMapFattal02(baseImg);
}
ipf.ToneMapFattal02(baseImg);
// perform transform
if (ipf.needsTransform()) {

View File

@ -855,9 +855,7 @@ private:
ipf.firstAnalysis (baseImg, params, hist16);
ipf.dehaze(baseImg);
if (params.fattal.enabled) {
ipf.ToneMapFattal02(baseImg);
}
ipf.ToneMapFattal02(baseImg);
// perform transform (excepted resizing)
if (ipf.needsTransform()) {

View File

@ -1014,6 +1014,10 @@ inline int find_fast_dim (int dim)
void ImProcFunctions::ToneMapFattal02 (Imagefloat *rgb)
{
if (!params->fattal.enabled) {
return;
}
BENCHFUN
const int detail_level = 3;