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

First batch of variable name normalisation in ICM tool, see #4478

Browse Source
This commit is contained in:
Hombre
2018-05-14 00:57:55 +02:00
parent d14d57a21e
commit fbc81028eb
31 changed files with 918 additions and 928 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rtengine/rtthumbnail.cc
View File

@@ -285,8 +285,8 @@ Image8 *load_inspector_mode(const Glib::ustring &fname, RawMetaDataLocation &rml
ProcParams neutral;
neutral.raw.bayersensor.method = RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::FAST);
neutral.raw.xtranssensor.method = RAWParams::XTransSensor::getMethodString(RAWParams::XTransSensor::Method::FAST);
neutral.icm.input = "(camera)";
neutral.icm.working = "RT_sRGB";
neutral.icm.inputProfile = "(camera)";
neutral.icm.workingProfile = "RT_sRGB";
src.preprocess(neutral.raw, neutral.lensProf, neutral.coarse, false);
src.demosaic(neutral.raw);
@@ -1233,7 +1233,7 @@ IImage8* Thumbnail::processImage (const procparams::ProcParams& params, eSensorT
bool opautili = false;
if (params.colorToning.enabled) {
TMatrix wprof = ICCStore::getInstance()->workingSpaceMatrix (params.icm.working);
TMatrix wprof = ICCStore::getInstance()->workingSpaceMatrix (params.icm.workingProfile);
double wp[3][3] = {
{wprof[0][0], wprof[0][1], wprof[0][2]},
{wprof[1][0], wprof[1][1], wprof[1][2]},
@@ -1285,10 +1285,10 @@ IImage8* Thumbnail::processImage (const procparams::ProcParams& params, eSensorT
if (isRaw) {
cmsHPROFILE dummy;
RawImageSource::findInputProfile (params.icm.input, nullptr, camName, &dcpProf, dummy);
RawImageSource::findInputProfile (params.icm.inputProfile, nullptr, camName, &dcpProf, dummy);
if (dcpProf) {
dcpProf->setStep2ApplyState (params.icm.working, params.icm.toneCurve, params.icm.applyLookTable, params.icm.applyBaselineExposureOffset, as);
dcpProf->setStep2ApplyState (params.icm.workingProfile, params.icm.toneCurve, params.icm.applyLookTable, params.icm.applyBaselineExposureOffset, as);
}
}