From 21758da234871b53e7f77cb03e6c34dfa0e9a7e3 Mon Sep 17 00:00:00 2001 From: Desmis Date: Mon, 5 Oct 2020 13:03:07 +0200 Subject: [PATCH] Suppress TRC working profile --- rtengine/dcrop.cc | 4 ++-- rtengine/improccoordinator.cc | 3 ++- rtengine/simpleprocess.cc | 4 ++-- rtgui/icmpanel.cc | 14 +++++++------- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/rtengine/dcrop.cc b/rtengine/dcrop.cc index 0d191c087..d5596c8ce 100644 --- a/rtengine/dcrop.cc +++ b/rtengine/dcrop.cc @@ -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); diff --git a/rtengine/improccoordinator.cc b/rtengine/improccoordinator.cc index a538391c4..405820b20 100644 --- a/rtengine/improccoordinator.cc +++ b/rtengine/improccoordinator.cc @@ -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); } } + */ } diff --git a/rtengine/simpleprocess.cc b/rtengine/simpleprocess.cc index 1455b0c64..e56111806 100644 --- a/rtengine/simpleprocess.cc +++ b/rtengine/simpleprocess.cc @@ -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); diff --git a/rtgui/icmpanel.cc b/rtgui/icmpanel.cc index 69cd21115..92827bf30 100644 --- a/rtgui/icmpanel.cc +++ b/rtgui/icmpanel.cc @@ -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);