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

Add primaries bestrgb betargb brucergb

Browse Source
This commit is contained in:
Desmis 2018-04-16 08:20:39 +02:00
parent 6dc36cfd18
commit 77464007db
9 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
rtdata/iccprofiles/output/BestRGB.icm
View File

Binary file not shown.

BIN
rtdata/iccprofiles/output/BetaRGB.icc
View File

Binary file not shown.

BIN
rtdata/iccprofiles/output/RT_best_V4.icc Normal file
View File

Binary file not shown.

BIN
rtdata/iccprofiles/output/RT_beta_V4.icc Normal file
View File

Binary file not shown.

BIN
rtdata/iccprofiles/output/RT_bruce_V4.icc Normal file
View File

Binary file not shown.

3
rtdata/languages/default
View File

@ -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

6
rtengine/iccstore.cc
View File

@ -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;

15
rtgui/icmpanel.cc
View File

@ -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";
}

6
rtgui/options.cc
View File

@ -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";