merge with Dev

2019-02-17 14:50:41 +01:00
parent 03315b496a c85dc2811b
commit 5e66e402fa
15 changed files with 241 additions and 231 deletions
--- a/rtengine/shmap.h
+++ b/rtengine/shmap.h
@@ -34,7 +34,7 @@ public:
    float** map;
    float   max_f, min_f, avg;

-    SHMap (int w, int h, bool multiThread);
+    SHMap (int w, int h);
    ~SHMap ();
    void updateLab (LabImage* img, double radius, bool hq, int skip);

@@ -44,7 +44,6 @@ public:

 private:
    int W, H;
-    bool multiThread;
    void fillLuminanceLab( LabImage * img, float **luminance);

    void fillLuminance( Imagefloat * img, float **luminance, double lumi[3] );