merge master into retinexgain

2016-05-01 08:53:52 +02:00
parent 67a19d0cc9 c8db56643a
commit a742e3a7ba
221 changed files with 7954 additions and 6498 deletions
--- a/rtengine/curves.h
+++ b/rtengine/curves.h
@@ -28,7 +28,7 @@
 #include "../rtgui/mydiagonalcurve.h"
 #include "color.h"
 #include "procparams.h"
-#include "editbuffer.h"
+#include "pipettebuffer.h"

 #include "LUT.h"

@@ -867,7 +867,6 @@ class PerceptualToneCurve : public ToneCurve
 private:
    static float cf_range[2];
    static float cf[1000];
-    static LUTf gamma2curve;
    // for ciecam02
    static float f, c, nc, yb, la, xw, yw, zw, gamut;
    static float n, d, nbb, ncb, cz, aw, wh, pfl, fl, pow1;