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

PIMPLed and streamlined ICCStore (#3691)

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

6
rtengine/rtthumbnail.cc
View File

@@ -768,7 +768,7 @@ void Thumbnail::init ()
cam2xyz[i][j] += xyz_sRGB[i][k] * colorMatrix[k][j];
}
camProfile = iccStore->createFromMatrix (cam2xyz, false, "Camera");
camProfile = ICCStore::getInstance()->createFromMatrix (cam2xyz, false, "Camera");
}
Thumbnail::Thumbnail () :
@@ -1029,13 +1029,13 @@ IImage8* Thumbnail::processImage (const procparams::ProcParams& params, int rhei
bool opautili = false;
if(params.colorToning.enabled) {
TMatrix wprof = iccStore->workingSpaceMatrix (params.icm.working);
TMatrix wprof = ICCStore::getInstance()->workingSpaceMatrix (params.icm.working);
double wp[3][3] = {
{wprof[0][0], wprof[0][1], wprof[0][2]},
{wprof[1][0], wprof[1][1], wprof[1][2]},
{wprof[2][0], wprof[2][1], wprof[2][2]}
};
TMatrix wiprof = iccStore->workingSpaceInverseMatrix (params.icm.working);
TMatrix wiprof = ICCStore::getInstance()->workingSpaceInverseMatrix (params.icm.working);
double wip[3][3] = {
{wiprof[0][0], wiprof[0][1], wiprof[0][2]},
{wiprof[1][0], wiprof[1][1], wiprof[1][2]},