Add "Inpaint opposed" to Highlight reconstruction and improved Itcwb (#6635)

* Essai HL

* Try Inpaint opposed

* Code improvment

* Add file

* Improvment to process inpaint opposed  and color propagation

* Clean code

* Change Blend to Coloropp in Profile pp3

* Enable BENCHFUN hilite_recon

* Clean rtengine cmakelist

* Comment unused code

* Neutralise unused code

* Change bad Exposure in Pop2Lab.pp3

* Try to fix bug when Inpaint Opposed is used and White balance disabled

* Changes to refreshmap

* Change to improccoordinator M_RETINEX

* Clean unused commented code

* Force Inpaint-opposed in rawimagesouce if wb change

* Suppressed message in console

* Change events and limits to 1 the number of calls to inpaint-opposed

* Comment code

* Add gain theshold to inpaint opposed

* fixed typo in procparams.cc

* Change in option.cc itcwb_sort to true

* Change itcw sorted in options and rawimagesource.cc

* Change sampling read datas Itcwb

* Allow or not purple in WB itcwb

* Added option icwb.nopurple to bypass settings

* Added code comment Itcwb

* optimize Itcwb between green and student

* Formated code used by Itcwb with Astylert.bat

* Change color_match - thanks to Lawrence37

* Remove wrong text
This commit is contained in:
Desmis
2023-02-09 07:14:20 +01:00
committed by GitHub
parent a3adbce04b
commit e5d46032ff
42 changed files with 1455 additions and 497 deletions

View File

@@ -594,6 +594,7 @@ void Options::setDefaults()
rtSettings.monitorIntent = rtengine::RI_RELATIVE;
rtSettings.monitorBPC = true;
rtSettings.autocielab = false;
rtSettings.observer10 = false;
rtSettings.autoMonitorProfile = false;
rtSettings.adobe = "RTv2_Medium"; // put the name of yours profiles (here windows)
rtSettings.prophoto = "RTv2_Large"; // these names appear in the menu "output profile"
@@ -623,14 +624,15 @@ void Options::setDefaults()
rtSettings.fftwsigma = true; //choice between sigma^2 or empirical formula
rtSettings.itcwb_thres = 34;//between 10 to 55
rtSettings.itcwb_sort = false;
rtSettings.itcwb_sorted = true;
rtSettings.itcwb_greenrange = 0;//between 0 to 2
rtSettings.itcwb_greendeltatemp = 2;//between 0 and 4
rtSettings.itcwb_forceextra = true;
rtSettings.itcwb_sizereference = 3;//between 1 and 5
rtSettings.itcwb_delta = 1;//between 0 and 5
rtSettings.itcwb_stdobserver10 = true;
rtSettings.itcwb_precis = 5;//3 or 5 or 9
rtSettings.itcwb_precis = 3;//3 or 5 or 9
rtSettings.itcwb_nopurple = true;
// end locallab
//wavelet
@@ -1760,6 +1762,10 @@ void Options::readFromFile(Glib::ustring fname)
rtSettings.autocielab = keyFile.get_boolean("Color Management", "Autocielab");
}
if (keyFile.has_key("Color Management", "Observer10")) {
rtSettings.observer10 = keyFile.get_boolean("Color Management", "Observer10");
}
if (keyFile.has_key("Color Management", "CRI")) {
rtSettings.CRI_color = keyFile.get_integer("Color Management", "CRI");
}
@@ -1795,14 +1801,18 @@ void Options::readFromFile(Glib::ustring fname)
rtSettings.itcwb_thres = keyFile.get_integer("Color Management", "Itcwb_thres");
}
if (keyFile.has_key("Color Management", "Itcwb_sort")) {
rtSettings.itcwb_sort = keyFile.get_boolean("Color Management", "Itcwb_sort");
if (keyFile.has_key("Color Management", "Itcwb_sorted")) {
rtSettings.itcwb_sorted = keyFile.get_boolean("Color Management", "Itcwb_sorted");
}
if (keyFile.has_key("Color Management", "Itcwb_forceextra")) {
rtSettings.itcwb_forceextra = keyFile.get_boolean("Color Management", "Itcwb_forceextra");
}
if (keyFile.has_key("Color Management", "Itcwb_nopurple")) {
rtSettings.itcwb_nopurple = keyFile.get_boolean("Color Management", "Itcwb_nopurple");
}
if (keyFile.has_key("Color Management", "Itcwb_stdobserver10")) {
rtSettings.itcwb_stdobserver10 = keyFile.get_boolean("Color Management", "Itcwb_stdobserver10");
}
@@ -2563,6 +2573,7 @@ void Options::saveToFile(Glib::ustring fname)
keyFile.set_string("Color Management", "MonitorProfile", rtSettings.monitorProfile);
keyFile.set_boolean("Color Management", "AutoMonitorProfile", rtSettings.autoMonitorProfile);
keyFile.set_boolean("Color Management", "Autocielab", rtSettings.autocielab);
keyFile.set_boolean("Color Management", "Observer10", rtSettings.observer10);
keyFile.set_boolean("Color Management", "RGBcurvesLumamode_Gamut", rtSettings.rgbcurveslumamode_gamut);
keyFile.set_integer("Color Management", "Intent", rtSettings.monitorIntent);
keyFile.set_boolean("Color Management", "MonitorBPC", rtSettings.monitorBPC);
@@ -2596,10 +2607,11 @@ void Options::saveToFile(Glib::ustring fname)
keyFile.set_double("Color Management", "CBDLlevel0", rtSettings.level0_cbdl);
keyFile.set_double("Color Management", "CBDLlevel123", rtSettings.level123_cbdl);
keyFile.set_integer("Color Management", "Itcwb_thres", rtSettings.itcwb_thres);
keyFile.set_boolean("Color Management", "Itcwb_sort", rtSettings.itcwb_sort);
keyFile.set_boolean("Color Management", "Itcwb_sorted", rtSettings.itcwb_sorted);
keyFile.set_integer("Color Management", "Itcwb_greenrange", rtSettings.itcwb_greenrange);
keyFile.set_integer("Color Management", "Itcwb_greendeltatemp", rtSettings.itcwb_greendeltatemp);
keyFile.set_boolean("Color Management", "Itcwb_forceextra", rtSettings.itcwb_forceextra);
keyFile.set_boolean("Color Management", "Itcwb_nopurple", rtSettings.itcwb_nopurple);
keyFile.set_integer("Color Management", "Itcwb_sizereference", rtSettings.itcwb_sizereference);
keyFile.set_integer("Color Management", "Itcwb_delta", rtSettings.itcwb_delta);
keyFile.set_boolean("Color Management", "Itcwb_stdobserver10", rtSettings.itcwb_stdobserver10);