From 75964dfd8b767ded7b92ea47f6f57159518e1be4 Mon Sep 17 00:00:00 2001
From: Alberto Griggio <agriggio@users.noreply.github.com>
Date: Wed, 10 Oct 2018 17:08:36 +0200
Subject: [PATCH] make sure that dehaze doesn't trigger Fattal tone mapping

(bad interaction due to sloppy rebasing)
---
 rtengine/rtthumbnail.cc   | 4 +---
 rtengine/simpleprocess.cc | 4 +---
 rtengine/tmo_fattal02.cc  | 4 ++++
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/rtengine/rtthumbnail.cc b/rtengine/rtthumbnail.cc
index bb710ee83..8a8ce1d9b 100644
--- a/rtengine/rtthumbnail.cc
+++ b/rtengine/rtthumbnail.cc
@@ -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()) {
diff --git a/rtengine/simpleprocess.cc b/rtengine/simpleprocess.cc
index 0846eacbd..5cd630315 100644
--- a/rtengine/simpleprocess.cc
+++ b/rtengine/simpleprocess.cc
@@ -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()) {
diff --git a/rtengine/tmo_fattal02.cc b/rtengine/tmo_fattal02.cc
index 351d60bc9..124cdbfb1 100644
--- a/rtengine/tmo_fattal02.cc
+++ b/rtengine/tmo_fattal02.cc
@@ -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;