merge with dev..

2018-06-14 09:06:29 +02:00
parent 03fb04cd81 e3cb9130a1
commit c1463c7edd
87 changed files with 1674 additions and 790 deletions
--- a/rtengine/color.h
+++ b/rtengine/color.h
@@ -612,6 +612,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