From d165a08e368c2ba174b08c1f4fd1df5472232273 Mon Sep 17 00:00:00 2001
From: Ingo Weyrich <heckflosse67@gmx.de>
Date: Mon, 20 Apr 2020 13:43:08 +0200
Subject: [PATCH 1/2] revert a801d76, fixes #5716

---
 rtengine/dcraw.cc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/rtengine/dcraw.cc b/rtengine/dcraw.cc
index 29796ea67..edb7dc317 100644
--- a/rtengine/dcraw.cc
+++ b/rtengine/dcraw.cc
@@ -9077,6 +9077,9 @@ void CLASS adobe_coeff (const char *make, const char *model)
   if (RT_blacklevel_from_constant == ThreeValBool::X || is_pentax_dng) {
     RT_blacklevel_from_constant = ThreeValBool::T;
   }
+  if (RT_matrix_from_constant == ThreeValBool::X) {
+    RT_matrix_from_constant = ThreeValBool::T;
+  }
   // -- RT --------------------------------------------------------------------
   
   for (i=0; i < sizeof table / sizeof *table; i++)
@@ -9096,9 +9099,6 @@ void CLASS adobe_coeff (const char *make, const char *model)
   } else if (load_raw == &CLASS panasonic_load_raw) {
       tiff_bps = RT_pana_info.bpp;
   }
-  if (RT_matrix_from_constant == ThreeValBool::X) {
-    RT_matrix_from_constant = ThreeValBool::T;
-  }
   { /* Check for RawTherapee table overrides and extensions */
       int black_level, white_level;
       short trans[12];
@@ -10546,7 +10546,7 @@ dng_skip:
        * files. See #4129 */) {
     memcpy (rgb_cam, cmatrix, sizeof cmatrix);
 //    raw_color = 0;
-    RT_matrix_from_constant = ThreeValBool::X;
+    RT_matrix_from_constant = ThreeValBool::F;
   }
   if(!strncmp(make, "Panasonic", 9) && !strncmp(model, "DMC-LX100",9))
 	adobe_coeff (make, model);

From 687217a6afed3aa781d7bbcfdd45ca00dffef64f Mon Sep 17 00:00:00 2001
From: Thanatomanic <6567747+Thanatomanic@users.noreply.github.com>
Date: Thu, 23 Apr 2020 10:10:42 +0200
Subject: [PATCH 2/2] Brighten the diagonal line in curves, tone down the
 gridlines. Fixes #5687.

---
 rtdata/themes/RawTherapee-GTK3-20_.css | 2 +-
 rtgui/mydiagonalcurve.cc               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rtdata/themes/RawTherapee-GTK3-20_.css b/rtdata/themes/RawTherapee-GTK3-20_.css
index a5f52a769..bdadc00db 100644
--- a/rtdata/themes/RawTherapee-GTK3-20_.css
+++ b/rtdata/themes/RawTherapee-GTK3-20_.css
@@ -565,7 +565,7 @@ button.text-button.toggle:hover:checked {
 .drawingarea {
     border-radius: 0;
     background-color: #2A2A2A;
-    border: 0.0833333333333333em solid #1D1D1D;
+    border: 0.0833333333333333em solid #888888;
 }
 .drawingarea:disabled {
     background-color: #444;
diff --git a/rtgui/mydiagonalcurve.cc b/rtgui/mydiagonalcurve.cc
index ac7976b7e..ce6c6f3ec 100644
--- a/rtgui/mydiagonalcurve.cc
+++ b/rtgui/mydiagonalcurve.cc
@@ -323,7 +323,7 @@ void MyDiagonalCurve::draw (int handle)
     // draw the grid lines:
     cr->set_line_width (1.0 * s);
     c = style->get_border_color(state);
-    cr->set_source_rgb (c.get_red(), c.get_green(), c.get_blue());
+    cr->set_source_rgba (c.get_red(), c.get_green(), c.get_blue(), 0.3);
     cr->set_antialias (Cairo::ANTIALIAS_NONE);
 
     for (int i = 0; i <= 10; i++) {