merged dev into locallab_dev

This commit is contained in:
heckflosse
2017-03-20 15:22:01 +01:00
85 changed files with 5889 additions and 1899 deletions

View File

@@ -5374,7 +5374,7 @@ void ImProcFunctions::Lab_Local (int call, int sp, float** shbuffer, LabImage *
// Gamut and Munsell control - very important do not desactivated to avoid crash
if (params->locallab.avoid) {
TMatrix wiprof = iccStore->workingSpaceInverseMatrix (params->icm.working);
TMatrix wiprof = ICCStore::getInstance()->workingSpaceInverseMatrix (params->icm.working);
float wip[3][3] = {
{static_cast<float> (wiprof[0][0]), static_cast<float> (wiprof[0][1]), static_cast<float> (wiprof[0][2])},
{static_cast<float> (wiprof[1][0]), static_cast<float> (wiprof[1][1]), static_cast<float> (wiprof[1][2])},