From 96a48c633482782a6bd58e31a0d64d468b773e04 Mon Sep 17 00:00:00 2001
From: Desmis <jdesmis@gmail.com>
Date: Sat, 9 Mar 2024 07:36:46 +0100
Subject: [PATCH] Local adjustments - set method Avoid Gamut to Munsell -
 better processing of highlights and gamut (#6965)

* Avoidgamumethod set to Munsell-only

* Set appimage.yml and windows.yml to la_gamutmunsell

* Remove procparams conversion XYZ absolute tu Munsell only

* Neutralize appimage.yml and windows.yml
---
 rtengine/iplocallab.cc    | 7 ++++---
 rtengine/procparams.cc    | 2 +-
 rtgui/controlspotpanel.cc | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/rtengine/iplocallab.cc b/rtengine/iplocallab.cc
index 4e9072f7e..a3e9dee22 100644
--- a/rtengine/iplocallab.cc
+++ b/rtengine/iplocallab.cc
@@ -76,7 +76,8 @@ constexpr double czlim = rtengine::RT_SQRT1_2;// 0.70710678118654752440;
 
 constexpr float clipLoc(float x)
 {
-    return rtengine::LIM(x, 0.f, 32767.f);
+    //return rtengine::LIM(x, 0.f, 32767.f);//remove leads to bad behavior
+    return x;
 }
 
 constexpr float clipDE(float x)
@@ -86,12 +87,12 @@ constexpr float clipDE(float x)
 
 constexpr float clipC(float x)
 {
-    return rtengine::LIM(x, -42000.f, 42000.f);
+    return rtengine::LIM(x, -100000.f, 100000.f);//increase LIM from 42000 to 1000000 to avoid clip and also imaginaries colors
 }
 
 constexpr float clipChro(float x)
 {
-    return rtengine::LIM(x, 0.f, 140.f);
+    return rtengine::LIM(x, 0.f, 300.f);//increase LIM from 140 to 300 to avoid clip and also imaginaries colors
 }
 
 constexpr double clipazbz(double x)
diff --git a/rtengine/procparams.cc b/rtengine/procparams.cc
index 43b8bb3ec..1b8269a2f 100644
--- a/rtengine/procparams.cc
+++ b/rtengine/procparams.cc
@@ -2972,7 +2972,7 @@ LocallabParams::LocallabSpot::LocallabSpot() :
     structexclu(0),
     struc(4.0),
     shapeMethod("IND"),
-    avoidgamutMethod("XYZ"),
+    avoidgamutMethod("MUNS"),
     loc{150, 150, 150, 150},
     centerX(0),
     centerY(0),
diff --git a/rtgui/controlspotpanel.cc b/rtgui/controlspotpanel.cc
index dd9c20d01..12eea86cc 100644
--- a/rtgui/controlspotpanel.cc
+++ b/rtgui/controlspotpanel.cc
@@ -407,7 +407,7 @@ ControlSpotPanel::ControlSpotPanel():
     avoidgamutMethod_->append(M("TP_LOCALLAB_GAMUTXYZABSO"));
     avoidgamutMethod_->append(M("TP_LOCALLAB_GAMUTXYZRELA"));
     avoidgamutMethod_->append(M("TP_LOCALLAB_GAMUTMUNSELL"));
-    avoidgamutMethod_->set_active(2);
+    avoidgamutMethod_->set_active(4);
     avoidgamutconn_ = avoidgamutMethod_->signal_changed().connect(
                      sigc::mem_fun(
                          *this, &ControlSpotPanel::avoidgamutMethodChanged));