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

Suppress TRC working profile

Browse Source
This commit is contained in:
Desmis
2020-10-05 13:03:07 +02:00
parent f168c9b48f
commit 21758da234
4 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rtengine/dcrop.cc
View File

@@ -804,7 +804,7 @@ void Crop::update(int todo)
if (todo & M_RGBCURVE) {
Imagefloat *workingCrop = baseCrop;
/*
if (params.icm.workingTRC == "Custom") { //exec TRC IN free
const Glib::ustring profile = params.icm.workingProfile;
@@ -818,7 +818,7 @@ void Crop::update(int todo)
parent->ipf.workingtrc(workingCrop, workingCrop, cw, ch, 5, params.icm.workingProfile, params.icm.workingTRCGamma, params.icm.workingTRCSlope, parent->getCustomTransformOut(), false, true, true);
}
}
*/
double rrm, ggm, bbm;
DCPProfileApplyState as;
DCPProfile *dcpProf = parent->imgsrc->getDCP(params.icm, as);

3
rtengine/improccoordinator.cc
View File

@@ -819,7 +819,7 @@ void ImProcCoordinator::updatePreviewImage(int todo, bool panningRelatedChange)
}
if (todo & (M_AUTOEXP | M_RGBCURVE)) {
if (params->icm.workingTRC == "Custom") { //exec TRC IN free
/* if (params->icm.workingTRC == "Custom") { //exec TRC IN free
if (oprevi == orig_prev) {
oprevi = new Imagefloat(pW, pH);
orig_prev->copyData(oprevi);
@@ -848,6 +848,7 @@ void ImProcCoordinator::updatePreviewImage(int todo, bool panningRelatedChange)
ipf.workingtrc(oprevi, oprevi, cw, ch, 5, params->icm.workingProfile, params->icm.workingTRCGamma, params->icm.workingTRCSlope, customTransformOut, false, true, true);
}
}
*/
}

4
rtengine/simpleprocess.cc
View File

@@ -918,7 +918,7 @@ private:
ipf.lab2rgb(labcbdl, *baseImg, params.icm.workingProfile);
}
//gamma TRC working
/* //gamma TRC working
if (params.icm.workingTRC == "Custom") { //exec TRC IN free
const Glib::ustring profile = params.icm.workingProfile;
@@ -932,7 +932,7 @@ private:
ipf.workingtrc(baseImg, baseImg, cw, ch, 5, params.icm.workingProfile, params.icm.workingTRCGamma, params.icm.workingTRCSlope, dummyTransForm, false, true, false);
}
}
*/
// RGB processing
curve1(65536);

14
rtgui/icmpanel.cc
View File

@@ -194,21 +194,21 @@ ICMPanel::ICMPanel() : FoldableToolPanel(this, "icm", M("TP_ICM_LABEL")), iuncha
wTRCHBox->pack_start(*wtrclab, Gtk::PACK_SHRINK);
wTRC = Gtk::manage(new MyComboBoxText());
wTRCHBox->pack_start(*wTRC, Gtk::PACK_EXPAND_WIDGET);
wProfVBox->pack_start(*wTRCHBox, Gtk::PACK_EXPAND_WIDGET);
// wProfVBox->pack_start(*wTRCHBox, Gtk::PACK_EXPAND_WIDGET);
wTRC->append(M("TP_ICM_WORKING_TRC_NONE"));
wTRC->append(M("TP_ICM_WORKING_TRC_CUSTOM"));
wTRC->set_active(0);
wTRC->set_tooltip_text(M("TP_ICM_WORKING_TRC_TOOLTIP"));
// wTRC->set_active(0);
// wTRC->set_tooltip_text(M("TP_ICM_WORKING_TRC_TOOLTIP"));
wGamma = Gtk::manage(new Adjuster(M("TP_ICM_WORKING_TRC_GAMMA"), 0.40, 15.0, 0.001, 2.4));
wSlope = Gtk::manage(new Adjuster(M("TP_ICM_WORKING_TRC_SLOPE"), 0., 150., 0.01, 12.92310));
wProfVBox->pack_start(*wGamma, Gtk::PACK_SHRINK);
wGamma->show();
// wProfVBox->pack_start(*wGamma, Gtk::PACK_SHRINK);
// wGamma->show();
wProfVBox->pack_start(*wSlope, Gtk::PACK_SHRINK);
wSlope->show();
// wProfVBox->pack_start(*wSlope, Gtk::PACK_SHRINK);
// wSlope->show();
wGamma->setAdjusterListener(this);