merge with dev

2018-11-01 08:37:28 +01:00
parent 21292f6db5 86b282fc68
commit b9c7fa80da
75 changed files with 1248 additions and 378 deletions
--- a/rtengine/color.h
+++ b/rtengine/color.h
@@ -206,6 +206,10 @@ public:
        return r * 0.2126729 + g * 0.7151521 + b * 0.0721750;
    }

+    static float rgbLuminance(float r, float g, float b, const double workingspace[3][3])
+    {
+        return r * workingspace[1][0] + g * workingspace[1][1] + b * workingspace[1][2];
+    }

    /**
    * @brief Convert red/green/blue to L*a*b