Merge branch 'releases' into dev

2024-02-15 23:15:50 -08:00
parent 93ceade262 437a867121
commit 7945f93e8f
65 changed files with 1657 additions and 1135 deletions
--- a/rtengine/simpleprocess.cc
+++ b/rtengine/simpleprocess.cc
@@ -287,7 +287,6 @@ private:
        int kmin  = 20;
        float minhist = 1000000000.f;
        float maxhist = -1000.f;
-        double tempitc = 5000.f;
        double greenitc = 1.;
        float temp0 = 5000.f;
        bool extra = false;
@@ -351,7 +350,7 @@ private:
            params.wb.equal = currWB.getEqual();
        }
        //end WB auto
-        
+
        calclum = nullptr ;
        params.dirpyrDenoise.getCurves(noiseLCurve, noiseCCurve);
        autoNR = (float) settings->nrauto;//