From 7f8b5bf2daf7735ef1f55b19d3495cae11d18028 Mon Sep 17 00:00:00 2001
From: Desmis <jdesmis@gmail.com>
Date: Sat, 4 May 2019 07:49:44 +0200
Subject: [PATCH] disable saturation TM

---
 rtengine/improcfun.cc | 12 ++++++------
 rtgui/locallab.cc     |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/rtengine/improcfun.cc b/rtengine/improcfun.cc
index c3ba7579b..90f986a74 100644
--- a/rtengine/improcfun.cc
+++ b/rtengine/improcfun.cc
@@ -5292,7 +5292,7 @@ void ImProcFunctions::EPDToneMaplocal(int sp, LabImage *lab, LabImage *tmp1, uns
     float edgest = ((float)params->locallab.spots.at(sp).estop) / 100.f;
     float sca  = ((float)params->locallab.spots.at(sp).scaltm) / 10.f;
     float gamm = ((float)params->locallab.spots.at(sp).gamma) / 100.f;
-    float satur = ((float)params->locallab.spots.at(sp).satur) / 100.f;
+//    float satur = ((float)params->locallab.spots.at(sp).satur) / 100.f;
     float rew = ((float)params->locallab.spots.at(sp).rewei);
     //Pointers to whole data and size of it.
     float *L = lab->L[0];
@@ -5375,10 +5375,10 @@ void ImProcFunctions::EPDToneMaplocal(int sp, LabImage *lab, LabImage *tmp1, uns
 
     //Restore past range, also desaturate a bit per Mantiuk's Color correction for tone mapping.
     float s = (1.0f + 38.7889f) * powf(Compression, 1.5856f) / (1.0f + 38.7889f * powf(Compression, 1.5856f));
-    float ss = 1.f - s;
-    float sat = 1.f + (2.5f * satur) * ss;
+//    float ss = 1.f - s;
+//    float sat = 1.f + (2.5f * satur) * ss;
 //    printf("s=%f  ss=%f sat=%f \n", s, ss, sat);
-    if(sat == 1.f) sat = 1.001f;
+//    if(sat == 1.f) sat = 1.001f;
 #ifdef _OPENMP
     #pragma omp parallel for            // removed schedule(dynamic,10)
 #endif
@@ -5388,8 +5388,8 @@ void ImProcFunctions::EPDToneMaplocal(int sp, LabImage *lab, LabImage *tmp1, uns
         int y = i - x * WW;
 
         tmp1->L[x][y] = L[i] * maxL * (1.f / gamm) + minL;
-        tmp1->a[x][y] = sat  * a[i];
-        tmp1->b[x][y] = sat  * b[i];
+        tmp1->a[x][y] = s  * a[i];
+        tmp1->b[x][y] = s  * b[i];
 
     }
 }
diff --git a/rtgui/locallab.cc b/rtgui/locallab.cc
index 98ac85bb1..1ff6ce1e0 100644
--- a/rtgui/locallab.cc
+++ b/rtgui/locallab.cc
@@ -792,7 +792,7 @@ Locallab::Locallab():
     tmBox->pack_start(*amount);
     tmBox->pack_start(*stren);
     tmBox->pack_start(*gamma);
-    tmBox->pack_start(*satur);
+//    tmBox->pack_start(*satur);
     tmBox->pack_start(*estop);
     tmBox->pack_start(*scaltm);
     tmBox->pack_start(*rewei);