Merge branch 'dev' into spot-removal-tool

2021-05-15 22:57:06 -07:00
parent 907da2db96 62996e16b1
commit ca4241109a
57 changed files with 4208 additions and 2488 deletions
--- a/rtengine/improccoordinator.h
+++ b/rtengine/improccoordinator.h
@@ -346,6 +346,10 @@ protected:
    std::vector<float> lumarefs;
    std::vector<float> sobelrefs;
    std::vector<float> avgs;
+    std::vector<float> meantms;
+    std::vector<float> stdtms;
+    std::vector<float> meanretis;
+    std::vector<float> stdretis;
    bool lastspotdup;
    bool previewDeltaE;
    int locallColorMask;