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

add free primaries to ICC V4

Browse Source
This commit is contained in:
Desmis
2018-04-22 18:18:18 +02:00
parent d183d47c09
commit bfb063f599
8 changed files with 237 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
rtgui/paramsedited.cc
View File

@@ -389,6 +389,12 @@ void ParamsEdited::set(bool v)
icm.freegamma = v;
icm.gampos = v;
icm.slpos = v;
icm.predx = v;
icm.predy = v;
icm.pgrex = v;
icm.pgrey = v;
icm.pblux = v;
icm.pbluy = v;
icm.wprimari = v;
icm.wprofile = v;
icm.wtemp = v;
@@ -939,6 +945,13 @@ void ParamsEdited::initFrom(const std::vector<rtengine::procparams::ProcParams>&
icm.freegamma = icm.freegamma && p.icm.freegamma == other.icm.freegamma;
icm.gampos = icm.gampos && p.icm.gampos == other.icm.gampos;
icm.slpos = icm.slpos && p.icm.slpos == other.icm.slpos;
icm.predx = icm.predx && p.icm.predx == other.icm.predx;
icm.predy = icm.predy && p.icm.predy == other.icm.predy;
icm.pgrex = icm.pgrex && p.icm.pgrex == other.icm.pgrex;
icm.pgrey = icm.pgrey && p.icm.pgrey == other.icm.pgrey;
icm.pblux = icm.pblux && p.icm.pblux == other.icm.pblux;
icm.pbluy = icm.pbluy && p.icm.pbluy == other.icm.pbluy;
icm.wprimari = icm.wprimari && p.icm.wprimari == other.icm.wprimari;
icm.wprofile = icm.wprofile && p.icm.wprofile == other.icm.wprofile;
icm.wtemp = icm.wtemp && p.icm.wtemp == other.icm.wtemp;
@@ -2444,6 +2457,30 @@ void ParamsEdited::combine(rtengine::procparams::ProcParams& toEdit, const rteng
toEdit.icm.slpos = dontforceSet && options.baBehav[ADDSET_FREE_OUTPUT_SLOPE] ? toEdit.icm.slpos + mods.icm.slpos : mods.icm.slpos;
}
if (icm.predx) {
toEdit.icm.predx = mods.icm.predx;
}
if (icm.predy) {
toEdit.icm.predy = mods.icm.predy;
}
if (icm.pgrex) {
toEdit.icm.pgrex = mods.icm.pgrex;
}
if (icm.pgrey) {
toEdit.icm.pgrey = mods.icm.pgrey;
}
if (icm.pblux) {
toEdit.icm.pblux = mods.icm.pblux;
}
if (icm.pbluy) {
toEdit.icm.pbluy = mods.icm.pbluy;
}
if (icm.gamma) {
toEdit.icm.gamma = mods.icm.gamma;
}