From ec818167166b4ed9f6b073c6a0e54a8d2555bdc8 Mon Sep 17 00:00:00 2001
From: Hombre57 <natureh.510@gmail.com>
Date: Wed, 21 Aug 2019 12:31:45 +0200
Subject: [PATCH 1/2] Code cleanup in rtgui/thresholdselector.cc

See issue #5423
---
 rtgui/thresholdselector.cc | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/rtgui/thresholdselector.cc b/rtgui/thresholdselector.cc
index 9b5250862..d9b0921ce 100644
--- a/rtgui/thresholdselector.cc
+++ b/rtgui/thresholdselector.cc
@@ -629,13 +629,8 @@ void ThresholdSelector::findBoundaries(double &min, double &max)
     switch (movedCursor) {
     case (TS_BOTTOMLEFT):
         if (separatedSliders) {
-            if (movedCursor == TS_BOTTOMLEFT) {
-                min = minValBottom;
-                max = maxValBottom;
-            } else if (movedCursor == TS_TOPLEFT) {
-                min = minValTop;
-                max = maxValTop;
-            }
+            min = minValBottom;
+            max = maxValBottom;
         } else if (initalEq1) {
             min = secondaryMovedCursor == TS_UNDEFINED ? positions[TS_TOPLEFT] : minValTop + (positions[TS_BOTTOMLEFT] - positions[TS_TOPLEFT]);
             max = positions[TS_BOTTOMRIGHT];
@@ -648,13 +643,8 @@ void ThresholdSelector::findBoundaries(double &min, double &max)
 
     case (TS_TOPLEFT):
         if (separatedSliders) {
-            if (movedCursor == TS_BOTTOMLEFT) {
-                min = minValBottom;
-                max = maxValBottom;
-            } else if (movedCursor == TS_TOPLEFT) {
-                min = minValTop;
-                max = maxValTop;
-            }
+            min = minValTop;
+            max = maxValTop;
         } else if (initalEq1) {
             min = minValTop;
             max = secondaryMovedCursor == TS_UNDEFINED ? positions[TS_BOTTOMLEFT] : positions[TS_BOTTOMRIGHT] - (positions[TS_BOTTOMLEFT] - positions[TS_TOPLEFT]);

From e93ce860678c4073e09ca35e01d4d802358d4751 Mon Sep 17 00:00:00 2001
From: Ingo Weyrich <heckflosse67@gmx.de>
Date: Wed, 21 Aug 2019 19:03:51 +0200
Subject: [PATCH 2/2] DNG with 'Embed Fast Load Data' not rendered the same as
 plain DNG or NEF, fixes #4695

---
 rtengine/dcraw.cc | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/rtengine/dcraw.cc b/rtengine/dcraw.cc
index a4450a69a..e15a2bb0f 100644
--- a/rtengine/dcraw.cc
+++ b/rtengine/dcraw.cc
@@ -6549,6 +6549,31 @@ guess_cfa_pc:
 	cblack[4] = cblack[5] = MIN(sqrt(len),64);
       case 50714:			/* BlackLevel */
                 RT_blacklevel_from_constant = ThreeValBool::F;
+//-----------------------------------------------------------------------------
+// taken from LibRaw.
+/*
+  Copyright 2008-2019 LibRaw LLC (info@libraw.org)
+
+LibRaw is free software; you can redistribute it and/or modify
+it under the terms of the one of two licenses as you choose:
+
+1. GNU LESSER GENERAL PUBLIC LICENSE version 2.1
+   (See file LICENSE.LGPL provided in LibRaw distribution archive for details).
+
+2. COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
+   (See file LICENSE.CDDL provided in LibRaw distribution archive for details).
+*/
+                if (tiff_ifd[ifd].samples > 1 && tiff_ifd[ifd].samples == len) // LinearDNG, per-channel black
+                {
+                    for (i = 0; i < 4 && i < len; i++)
+                    {
+                        double b = getreal(type);
+                        cblack[i] = b+0.5;
+                    }
+
+                    black = 0;
+                } else
+//-----------------------------------------------------------------------------
 		if(cblack[4] * cblack[5] == 0) {
 			int dblack[] = { 0,0,0,0 };
 			black = getreal(type);