PIMPLed and streamlined ICCStore (#3691)

This commit is contained in:
Flössie
2017-03-18 11:57:29 +01:00
parent 567ed3629c
commit 97caf21b5c
22 changed files with 941 additions and 841 deletions

View File

@@ -2140,7 +2140,7 @@ void PerceptualToneCurve::initApplyState(PerceptualToneCurveState & state, Glib:
state.isProphoto = true;
} else {
state.isProphoto = false;
TMatrix Work = iccStore->workingSpaceMatrix(workingSpace);
TMatrix Work = ICCStore::getInstance()->workingSpaceMatrix(workingSpace);
memset(state.Working2Prophoto, 0, sizeof(state.Working2Prophoto));
for (int i = 0; i < 3; i++)
@@ -2149,7 +2149,7 @@ void PerceptualToneCurve::initApplyState(PerceptualToneCurveState & state, Glib:
state.Working2Prophoto[i][j] += prophoto_xyz[i][k] * Work[k][j];
}
Work = iccStore->workingSpaceInverseMatrix (workingSpace);
Work = ICCStore::getInstance()->workingSpaceInverseMatrix (workingSpace);
memset(state.Prophoto2Working, 0, sizeof(state.Prophoto2Working));
for (int i = 0; i < 3; i++)