liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merged dev into locallab_dev

Browse Source
This commit is contained in:
heckflosse
2017-03-20 15:22:01 +01:00
parent 0464babf36 2228159ff8
commit 04bdea0b84
85 changed files with 5889 additions and 1899 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rtengine/curves.cc
View File

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