merge with dev

This commit is contained in:
Desmis
2018-02-15 16:57:23 +01:00
61 changed files with 201 additions and 4414 deletions

View File

@@ -1378,7 +1378,7 @@ public:
* @param CC chroma before [0 ; 180]
* @param corectionHuechroma hue correction depending on chromaticity (saturation), in radians [0 ; 0.45] (return value)
* @param correctlum hue correction depending on luminance (brightness, contrast,...), in radians [0 ; 0.45] (return value)
* @param munsDbgInfo (Debug target only) object to collect informations
* @param munsDbgInfo (Debug target only) object to collect information
*/
#ifdef _DEBUG
@@ -1828,7 +1828,7 @@ public:
//hr=translate Hue Lab value (-Pi +Pi) in approximative hr (hsv values) (0 1) [red 1/6 yellow 1/6 green 1/6 cyan 1/6 blue 1/6 magenta 1/6 ]
// with multi linear correspondances (I expect there is no error !!)
double hr = 0.0;
//allways put h between 0 and 1
//always put h between 0 and 1
if (HH >= 0.f && HH < 0.6f) {
hr = 0.11666 * double (HH) + 0.93; //hr 0.93 1.00 full red