liz/rawTherapee
liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make sure that dehaze doesn't trigger Fattal tone mapping

Browse Source 
(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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rtengine/rtthumbnail.cc
View File

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

2
rtengine/simpleprocess.cc
View File

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

4
rtengine/tmo_fattal02.cc
View File

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