From b13db578eb2335432c1ef083eb76a55314c4e807 Mon Sep 17 00:00:00 2001
From: Alberto Griggio <agriggio@users.noreply.github.com>
Date: Sun, 21 Jan 2018 19:21:41 +0100
Subject: [PATCH] do not reset highlight compression when doing histogram
 matching

---
 rtengine/improccoordinator.cc | 1 -
 rtengine/simpleprocess.cc     | 1 -
 rtgui/tonecurve.cc            | 4 +++-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/rtengine/improccoordinator.cc b/rtengine/improccoordinator.cc
index d3a32140a..62891a03f 100644
--- a/rtengine/improccoordinator.cc
+++ b/rtengine/improccoordinator.cc
@@ -459,7 +459,6 @@ void ImProcCoordinator::updatePreviewImage (int todo, Crop* cropCall)
             params.toneCurve.brightness = 0;
             params.toneCurve.contrast = 0;
             params.toneCurve.black = 0;
-            params.toneCurve.hlcompr = 0;
 
             if (aeListener) {
                 aeListener->autoMatchedToneCurveChanged(params.toneCurve.curveMode, params.toneCurve.curve);
diff --git a/rtengine/simpleprocess.cc b/rtengine/simpleprocess.cc
index 45956f262..685e1d53e 100644
--- a/rtengine/simpleprocess.cc
+++ b/rtengine/simpleprocess.cc
@@ -753,7 +753,6 @@ private:
             params.toneCurve.brightness = 0;
             params.toneCurve.contrast = 0;
             params.toneCurve.black = 0;
-            params.toneCurve.hlcompr = 0;
 
         }        
 
diff --git a/rtgui/tonecurve.cc b/rtgui/tonecurve.cc
index ce938178e..07822f857 100644
--- a/rtgui/tonecurve.cc
+++ b/rtgui/tonecurve.cc
@@ -567,7 +567,9 @@ void ToneCurve::adjusterChanged (Adjuster* a, double newval)
         return;
     }
 
-    setHistmatching(false);
+    if (a != expcomp && a != hlcompr && a != hlcomprthresh) {
+        setHistmatching(false);
+    }
     
     Glib::ustring costr;