diff --git a/rtengine/improccoordinator.cc b/rtengine/improccoordinator.cc index 6ff60506b..96a55989e 100644 --- a/rtengine/improccoordinator.cc +++ b/rtengine/improccoordinator.cc @@ -31,7 +31,7 @@ extern const Settings* settings; ImProcCoordinator::ImProcCoordinator () : orig_prev(NULL), oprevi(NULL), oprevl(NULL), nprevl(NULL), previmg(NULL), workimg(NULL), - ncie(NULL), imgsrc(NULL), shmap(NULL), lastAwbEqual(0.), ipf(¶ms, true), monitorIntent(RI_PERCEPTUAL), scale(10), + ncie(NULL), imgsrc(NULL), shmap(NULL), lastAwbEqual(0.), ipf(¶ms, true), monitorIntent(RI_RELATIVE), scale(10), highDetailPreprocessComputed(false), highDetailRawComputed(false), allocated(false), bwAutoR(-9000.f), bwAutoG(-9000.f), bwAutoB(-9000.f), CAMMean(0.), diff --git a/rtengine/procparams.cc b/rtengine/procparams.cc index 2c93bfd47..613334469 100644 --- a/rtengine/procparams.cc +++ b/rtengine/procparams.cc @@ -894,7 +894,7 @@ void ColorManagementParams::setDefaults() dcpIlluminant = 0; working = "ProPhoto"; output = "RT_sRGB"; - outputIntent = RI_PERCEPTUAL; + outputIntent = RI_RELATIVE; gamma = "default"; gampos = 2.22; slpos = 4.5; @@ -2551,15 +2551,22 @@ int ProcParams::save (Glib::ustring fname, Glib::ustring fname2, bool fnameAbsol if (!pedited || pedited->icm.outputIntent) { Glib::ustring intent; - if (icm.outputIntent == RI_PERCEPTUAL) { + switch (icm.outputIntent) { + default: + case RI_PERCEPTUAL: intent = "Perceptual"; - } else if (icm.outputIntent == RI_RELATIVE) { + break; + case RI_RELATIVE: intent = "Relative"; - } else if (icm.outputIntent == RI_SATURATION) { + break; + case RI_SATURATION: intent = "Saturation"; - } else if (icm.outputIntent == RI_ABSOLUTE) { + break; + case RI_ABSOLUTE: intent = "Absolute"; + break; } + keyFile.set_string ("Color Management", "OutputProfileIntent", intent); } diff --git a/rtgui/icmpanel.cc b/rtgui/icmpanel.cc index d24ec9312..8b8057d45 100644 --- a/rtgui/icmpanel.cc +++ b/rtgui/icmpanel.cc @@ -200,7 +200,7 @@ ICMPanel::ICMPanel () : FoldableToolPanel(this, "icm", M("TP_ICM_LABEL")), iunch ointent->append_text (M("PREFERENCES_INTENT_RELATIVE")); ointent->append_text (M("PREFERENCES_INTENT_SATURATION")); ointent->append_text (M("PREFERENCES_INTENT_ABSOLUTE")); - ointent->set_active(0); + ointent->set_active (1); oVBox->pack_start(*riHBox, Gtk::PACK_SHRINK); // Output gamma @@ -625,7 +625,7 @@ void ICMPanel::write (ProcParams* pp, ParamsEdited* pedited) if (ointentVal >= 0 && ointentVal < RI__COUNT) { pp->icm.outputIntent = static_cast(ointentVal); } else { - pp->icm.outputIntent = rtengine::RI_PERCEPTUAL; + pp->icm.outputIntent = rtengine::RI_RELATIVE; } pp->icm.freegamma = freegamma->get_active(); diff --git a/rtgui/options.cc b/rtgui/options.cc index c2e31ec38..e97a27ecb 100644 --- a/rtgui/options.cc +++ b/rtgui/options.cc @@ -470,7 +470,7 @@ void Options::setDefaults () fastexport_icm_input = "(camera)"; fastexport_icm_working = "ProPhoto"; fastexport_icm_output = "RT_sRGB"; - fastexport_icm_outputIntent = rtengine::RI_PERCEPTUAL; + fastexport_icm_outputIntent = rtengine::RI_RELATIVE; fastexport_icm_gamma = "default"; fastexport_resize_enabled = true; fastexport_resize_scale = 1; @@ -637,7 +637,7 @@ void Options::setDefaults () rtSettings.leveldnautsimpl = 0; rtSettings.monitorProfile = Glib::ustring(); - rtSettings.monitorIntent = rtengine::RI_PERCEPTUAL; + rtSettings.monitorIntent = rtengine::RI_RELATIVE; rtSettings.autoMonitorProfile = false; rtSettings.adobe = "RT_Medium_gsRGB"; // put the name of yours profiles (here windows) rtSettings.prophoto = "RT_Large_gBT709"; // these names appear in the menu "output profile" diff --git a/rtgui/paramsedited.cc b/rtgui/paramsedited.cc index 28d4c13b8..866142a10 100644 --- a/rtgui/paramsedited.cc +++ b/rtgui/paramsedited.cc @@ -339,6 +339,7 @@ void ParamsEdited::set (bool v) icm.dcpIlluminant = v; icm.working = v; icm.output = v; + icm.outputIntent = v; icm.gamma = v; icm.freegamma = v; icm.gampos = v;