merge with dev - I hope no error

This commit is contained in:
Desmis
2018-01-02 19:58:42 +01:00
66 changed files with 2796 additions and 2393 deletions

View File

@@ -475,8 +475,8 @@ public:
* @param a channel [-42000 ; +42000] ; can be more than 42000 (return value)
* @param b channel [-42000 ; +42000] ; can be more than 42000 (return value)
*/
static void XYZ2Lab (float x, float y, float z, float &L, float &a, float &b);
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);
/**
* @brief Convert Lab in Yuv