From 2ff619e5e2832df25658186905bc89353351abd0 Mon Sep 17 00:00:00 2001
From: Desmis <jdesmis@gmail.com>
Date: Sat, 11 Jan 2020 08:23:15 +0100
Subject: [PATCH 1/2] Fixed bad behavior gamma slider tone-mapping

---
 rtgui/epd.cc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/rtgui/epd.cc b/rtgui/epd.cc
index 307790ff7..6544b7131 100644
--- a/rtgui/epd.cc
+++ b/rtgui/epd.cc
@@ -69,6 +69,7 @@ void EdgePreservingDecompositionUI::read(const ProcParams *pp, const ParamsEdite
 
     setEnabled(pp->epd.enabled);
     strength->set_sensitive (true);
+    gamma->set_sensitive (true);
 
     if(pp->wavelet.enabled) {
         if(pp->wavelet.tmrs == 0) {
@@ -98,6 +99,7 @@ void EdgePreservingDecompositionUI::write(ProcParams *pp, ParamsEdited *pedited)
     pp->epd.reweightingIterates = reweightingIterates->getValue();
     pp->epd.enabled = getEnabled();
     strength->set_sensitive (true);
+    gamma->set_sensitive (true);
 
     if(pp->wavelet.enabled) {
         if(pp->wavelet.tmrs == 0) {

From 1a02f16c35ff7e366010c1170637b7b7a9dff5a0 Mon Sep 17 00:00:00 2001
From: Ingo Weyrich <heckflosse67@gmx.de>
Date: Sat, 11 Jan 2020 11:20:41 +0100
Subject: [PATCH 2/2] crash in Tab: transform, fixes #5604

---
 rtengine/iptransform.cc | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/rtengine/iptransform.cc b/rtengine/iptransform.cc
index 29e10035e..9e7c61dcf 100644
--- a/rtengine/iptransform.cc
+++ b/rtengine/iptransform.cc
@@ -1006,11 +1006,6 @@ void ImProcFunctions::transformGeneral(bool highQuality, Imagefloat *original, I
         calcPCVignetteParams(fW, fH, oW, oH, params->pcvignette, params->crop, pcv);
     }
 
-    const std::array<const float* const*, 3> chOrig = {
-        original->r.ptrs,
-        original->g.ptrs,
-        original->b.ptrs
-    };
     const std::array<float* const*, 3> chTrans = {
         transformed->r.ptrs,
         transformed->g.ptrs,
@@ -1068,6 +1063,13 @@ void ImProcFunctions::transformGeneral(bool highQuality, Imagefloat *original, I
             logEncode(original, original, multiThread);
         }
     }
+
+    const std::array<const float* const*, 3> chOrig = {
+        original->r.ptrs,
+        original->g.ptrs,
+        original->b.ptrs
+    };
+
     // main cycle
 #ifdef _OPENMP
     #pragma omp parallel for schedule(dynamic, 16) if(multiThread)