merge with dev

2020-03-19 13:40:11 +01:00
parent 54fdc848f0 d63fb77c8c
commit e573de78b4
169 changed files with 11568 additions and 5931 deletions
--- a/rtengine/shmap.h
+++ b/rtengine/shmap.h
@@ -51,8 +51,6 @@ private:
    int W, H;
    void fillLuminanceLab( LabImage * img, float **luminance);

-    void fillLuminance( Imagefloat * img, float **luminance, double lumi[3] );
-    void fillLuminanceL( float ** L, float **luminance );
    void dirpyr_shmap(float ** data_fine, float ** data_coarse, int width, int height, const LUTf& rangefn, int level, int scale);

 };