From 77464007dba99698c96cd12d5c8b9643f4657b24 Mon Sep 17 00:00:00 2001 From: Desmis Date: Mon, 16 Apr 2018 08:20:39 +0200 Subject: [PATCH] Add primaries bestrgb betargb brucergb --- rtdata/iccprofiles/output/BestRGB.icm | Bin 552 -> 0 bytes rtdata/iccprofiles/output/BetaRGB.icc | Bin 592 -> 0 bytes rtdata/iccprofiles/output/RT_best_V4.icc | Bin 0 -> 676 bytes rtdata/iccprofiles/output/RT_beta_V4.icc | Bin 0 -> 676 bytes rtdata/iccprofiles/output/RT_bruce_V4.icc | Bin 0 -> 680 bytes rtdata/languages/default | 3 +++ rtengine/iccstore.cc | 6 +++--- rtgui/icmpanel.cc | 15 +++++++++++++++ rtgui/options.cc | 6 +++--- 9 files changed, 24 insertions(+), 6 deletions(-) delete mode 100644 rtdata/iccprofiles/output/BestRGB.icm delete mode 100644 rtdata/iccprofiles/output/BetaRGB.icc create mode 100644 rtdata/iccprofiles/output/RT_best_V4.icc create mode 100644 rtdata/iccprofiles/output/RT_beta_V4.icc create mode 100644 rtdata/iccprofiles/output/RT_bruce_V4.icc diff --git a/rtdata/iccprofiles/output/BestRGB.icm b/rtdata/iccprofiles/output/BestRGB.icm deleted file mode 100644 index 46c3ae6b08f0d9b38dffaa34ab5d61b3a613ea94..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 552 zcmZQzVA61OadKr6U|`72D=7+ccT$Lmj8b5~$iU3N%OJv_!=Rg(TwLH75a7cA1bO*+ zsUR8^e7nZL2okxh3o;8;jv$XKxuB>7sOk?88>OTcCo?cG8UWcz>@y&C5`=vR#4ZAQ0;uK-lu&4I8*KDnt@@@ VVFm`K0)&`CJ1ppvgPyGM@ diff --git a/rtdata/iccprofiles/output/BetaRGB.icc b/rtdata/iccprofiles/output/BetaRGB.icc deleted file mode 100644 index c13aa3477694dc686e0caae0b609d970f55e49fc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 592 zcmb`Eze~eF6vw{_LTwRoa1?o?LT!uPN)eh41+7qmgSsW@(G=6>r zCQdupZD|L@c?_|Ng3H&z%16v9XND;aY>a0)?lHA4k})d%HC)+ z1dCYaUXlfTzHlyUaj+u3l)4hDW03|N`QVcUQfa^nnM1{cFh4VIPYQlB>=*oHSe?0j zz}{fqoD{rc*e|$lIM^*OZ7CS;WQrmQIgCW)Qci=O=?Q6NQIhYU6vn@3Ym2QSsEc%nAlRXTwxS>iVnH3$p{-C|Bu&#sXxfmZNO9={_z(&{ zMiCdC1O>raTm=`UgM;-u&5)(tJRv#1`<*|z_grA)rlwnNXc@5To|D_%R*T0cYUCXu zOd*UFjA^=SALMrm7;4>DC=z^Gl3qj81_xqg!_@&L%J7=bfYU_^Q*t3LCDNS1sq3hSn0F{e#luxd^2p>J}MxKTgK z)6eluAcq1@QGx*%9@0?hH#wOMXEwM_{*}NX8qC%Cwb6ouGgM)+LyBsXJq-E^b%Re0 zEtxy(Xu&+)N+#Wx6vXKxeFkDcuiK+>tYU6vn^w53RO}pdd(*41yghXbWzFDCnTA(56sbBuUd&Y-+ekk#0VK@1TQ= zba8j;<{&r-x{9x$ba1eKHyN_DnXvH)N|NbK(-9tdn|yfbIg+o*3ua5N zlW)m6!2^H-j=XoWg(w4?6Nt;bM!EDR5@v*U7yyDB*&&CcT3m1kTVzi#>8wyX;{xHmF;C z+UUu-a~&<5r`ssxeMv!@G2t_i0!G6Tjo%8xFXulSuJ6A9#T!{0YRd;evI9H~LM`_Q z+EdpY}c*7KtT#crti%xvT1fb!#(%mJsZXrLL zS}VOzjr=4^QfrD_#qylx)we~4+T9f)6TEzGdJRqcci>^o_ACfJPUr&ytLJE z3?GOeTg^&M{6(B`bwTlk(W?Pp8*T*r+pt?K%t1IVo@@j>Ww;t}*|61g+sfG!KW(?V zxlyLRJAK?D$|m8*j9&i8Z_yU zk=j)UTYFu)t*^zlnZ4>{gPD5uT(&QT;)@Xb<@>kKVB{0r@B99r&%S@(gUAm!I~>&S zZo!+65FH(8=>hSS(UD~!X*y!0nd#jW(uiOPrT4Y>IVVFOzwZ@1@EB7 V5pzQCI}~>ye+)-;NNXj^e*rxoaBBbn literal 0 HcmV?d00001 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";