diff --git a/rtdata/iccprofiles/output/BestRGB.icm b/rtdata/iccprofiles/output/BestRGB.icm deleted file mode 100644 index 46c3ae6b0..000000000 Binary files a/rtdata/iccprofiles/output/BestRGB.icm and /dev/null differ diff --git a/rtdata/iccprofiles/output/BetaRGB.icc b/rtdata/iccprofiles/output/BetaRGB.icc deleted file mode 100644 index c13aa3477..000000000 Binary files a/rtdata/iccprofiles/output/BetaRGB.icc and /dev/null differ diff --git a/rtdata/iccprofiles/output/RT_best_V4.icc b/rtdata/iccprofiles/output/RT_best_V4.icc new file mode 100644 index 000000000..881651e7b Binary files /dev/null and b/rtdata/iccprofiles/output/RT_best_V4.icc differ diff --git a/rtdata/iccprofiles/output/RT_beta_V4.icc b/rtdata/iccprofiles/output/RT_beta_V4.icc new file mode 100644 index 000000000..aa31ee87f Binary files /dev/null and b/rtdata/iccprofiles/output/RT_beta_V4.icc differ diff --git a/rtdata/iccprofiles/output/RT_bruce_V4.icc b/rtdata/iccprofiles/output/RT_bruce_V4.icc new file mode 100644 index 000000000..cbf797b95 Binary files /dev/null and b/rtdata/iccprofiles/output/RT_bruce_V4.icc differ diff --git a/rtdata/languages/default b/rtdata/languages/default index 4e6c52882..9b4ded9d6 100644 --- a/rtdata/languages/default +++ b/rtdata/languages/default @@ -1606,6 +1606,9 @@ TP_GAMMA_PRIM_PROPH;Prophoto TP_GAMMA_PRIM_REC2020;Rec2020 TP_GAMMA_PRIM_SRGB;sRGB TP_GAMMA_PRIM_WIDEG;Widegamut +TP_GAMMA_PRIM_BEST;BestRGB +TP_GAMMA_PRIM_BETA;BetaRGB +TP_GAMMA_PRIM_BRUCE;BruceRGB TP_GENERAL_11SCALE_TOOLTIP;The effects of this tool are only visible or only accurate at a preview scale of 1:1. TP_GRADIENT_CENTER;Center TP_GRADIENT_CENTER_X;Center X diff --git a/rtengine/iccstore.cc b/rtengine/iccstore.cc index a83ffb415..e6445d387 100644 --- a/rtengine/iccstore.cc +++ b/rtengine/iccstore.cc @@ -1353,7 +1353,7 @@ cmsHPROFILE rtengine::ICCStore::createGammaProfile(const procparams::ColorManage p[4] = 0.1500; p[5] = 0.0600; temp = ColorTemp::D65; - } else if (icm.wprimari == "Beta RGB") { + } else if (icm.wprimari == "BetaRGB") { p[0] = 0.6888; // Beta primaries p[1] = 0.3112; p[2] = 0.1986; @@ -1458,7 +1458,7 @@ cmsHPROFILE rtengine::ICCStore::createCustomGammaOutputProfile(const procparams: } else if (icm.wprimari == "wideg" && rtengine::ICCStore::getInstance()->outputProfileExist(options.rtSettings.widegamut)) { outProfile = options.rtSettings.widegamut; outPr = "RT_wide"; - } else if (icm.wprimari == "Beta RGB" && rtengine::ICCStore::getInstance()->outputProfileExist(options.rtSettings.beta)) { + } else if (icm.wprimari == "BetaRGB" && rtengine::ICCStore::getInstance()->outputProfileExist(options.rtSettings.beta)) { outProfile = options.rtSettings.beta; outPr = "RT_beta"; } else if (icm.wprimari == "BestRGB" && rtengine::ICCStore::getInstance()->outputProfileExist(options.rtSettings.best)) { @@ -1645,7 +1645,7 @@ cmsHPROFILE rtengine::ICCStore::createCustomGammaOutputProfile(const procparams: p[4] = 0.1500; p[5] = 0.0600; temp = ColorTemp::D65; - } else if (icm.wprimari == "Beta RGB") { + } else if (icm.wprimari == "BetaRGB") { p[0] = 0.6888; // Beta primaries p[1] = 0.3112; p[2] = 0.1986; diff --git a/rtgui/icmpanel.cc b/rtgui/icmpanel.cc index 217a6aac1..b80161603 100644 --- a/rtgui/icmpanel.cc +++ b/rtgui/icmpanel.cc @@ -265,6 +265,9 @@ ICMPanel::ICMPanel() : FoldableToolPanel(this, "icm", M("TP_ICM_LABEL")), iuncha wprimari->append(M("TP_GAMMA_PRIM_REC2020")); wprimari->append(M("TP_GAMMA_PRIM_SRGB")); wprimari->append(M("TP_GAMMA_PRIM_WIDEG")); + wprimari->append(M("TP_GAMMA_PRIM_BEST")); + wprimari->append(M("TP_GAMMA_PRIM_BETA")); + wprimari->append(M("TP_GAMMA_PRIM_BRUCE")); wprimari->set_active(5); //sliders gampos and slpos @@ -596,6 +599,12 @@ void ICMPanel::read(const ProcParams* pp, const ParamsEdited* pedited) wprimari->set_active(5); } else if (pp->icm.wprimari == "wideg") { wprimari->set_active(6); + } else if (pp->icm.wprimari == "BestRGB") { + wprimari->set_active(7); + } else if (pp->icm.wprimari == "BetaRGB") { + wprimari->set_active(8); + } else if (pp->icm.wprimari == "BruceRGB") { + wprimari->set_active(9); } @@ -756,6 +765,12 @@ void ICMPanel::write(ProcParams* pp, ParamsEdited* pedited) pp->icm.wprimari = "srgb"; } else if (wprimari->get_active_row_number() == 6) { pp->icm.wprimari = "wideg"; + } else if (wprimari->get_active_row_number() == 7) { + pp->icm.wprimari = "BestRGB"; + } else if (wprimari->get_active_row_number() == 8) { + pp->icm.wprimari = "BetaRGB"; + } else if (wprimari->get_active_row_number() == 9) { + pp->icm.wprimari = "BruceRGB"; } diff --git a/rtgui/options.cc b/rtgui/options.cc index 338d1ac4c..aa63df773 100644 --- a/rtgui/options.cc +++ b/rtgui/options.cc @@ -537,9 +537,9 @@ void Options::setDefaults() rtSettings.srgb10 = "RT_sRGB_g10"; rtSettings.widegamut = "WideGamutRGB"; rtSettings.srgb = "RT_sRGB-V2-srgbtrc"; - rtSettings.bruce = "Bruce"; - rtSettings.beta = "BetaRGB"; - rtSettings.best = "BestRGB"; + rtSettings.bruce = "RT_bruce_V4"; + rtSettings.beta = "RT_beta_V4"; + rtSettings.best = "RT_best_V4"; rtSettings.rec2020 = "RT_Rec2020-V2-srgbtrc"; rtSettings.ACESp0 = "RT_ACES-V2-srgbtrc"; rtSettings.ACESp1 = "RT_acesp1_V4";