Merge branch 'dev' into testoutputprofile

2018-06-14 21:47:14 +02:00
parent 404375e313 5a2e6f5f76
commit e2dc8ea2c3
105 changed files with 3703 additions and 2470 deletions
--- a/rtengine/color.h
+++ b/rtengine/color.h
@@ -611,6 +611,7 @@ public:
    */
    static void XYZ2Lab(float x, float y, float z, float &L, float &a, float &b);
    static void RGB2Lab(float *X, float *Y, float *Z, float *L, float *a, float *b, const float wp[3][3], int width);
+    static void RGB2L(float *X, float *Y, float *Z, float *L, const float wp[3][3], int width);

    /**
    * @brief Convert Lab in Yuv