Merge from branch 'dev'
This commit is contained in:
@@ -395,8 +395,11 @@ Gtk::Widget* Preferences::getBatchProcPanel ()
|
||||
appendBehavList (mi, M ("TP_WAVELET_THR"), ADDSET_WA_THRR, true);
|
||||
appendBehavList (mi, M ("TP_WAVELET_RESCONH"), ADDSET_WA_RESCONH, true);
|
||||
appendBehavList (mi, M ("TP_WAVELET_THRH"), ADDSET_WA_THRRH, true);
|
||||
appendBehavList (mi, M ("TP_WAVELET_RADIUS"), ADDSET_WA_RADIUS, true);
|
||||
appendBehavList (mi, M ("TP_WAVELET_RESCHRO"), ADDSET_WA_RESCHRO, true);
|
||||
appendBehavList (mi, M ("TP_WAVELET_TMSTRENGTH"), ADDSET_WA_TMRS, true);
|
||||
appendBehavList (mi, M ("TP_WAVELET_TMEDGS"), ADDSET_WA_EDGS, true);
|
||||
appendBehavList (mi, M ("TP_WAVELET_TMSCALE"), ADDSET_WA_SCALE, true);
|
||||
appendBehavList (mi, M ("TP_WAVELET_SKY"), ADDSET_WA_SKYPROTECT, true);
|
||||
appendBehavList (mi, M ("TP_WAVELET_CONTRA"), ADDSET_WA_CONTRAST, true);
|
||||
appendBehavList (mi, M ("TP_WAVELET_STRENGTH"), ADDSET_WA_STRENGTH, true);
|
||||
@@ -781,7 +784,7 @@ Gtk::Widget* Preferences::getColorManPanel ()
|
||||
|
||||
const std::vector<Glib::ustring> profiles = rtengine::ICCStore::getInstance ()->getProfiles (rtengine::ICCStore::ProfileType::MONITOR);
|
||||
|
||||
for (const auto profile : profiles) {
|
||||
for (const auto& profile : profiles) {
|
||||
if (profile.find("file:") != 0) {
|
||||
std::string fileis_RTv4 = profile.substr(0, 4);
|
||||
|
||||
@@ -850,7 +853,7 @@ Gtk::Widget* Preferences::getColorManPanel ()
|
||||
|
||||
const std::vector<Glib::ustring> prtprofiles = rtengine::ICCStore::getInstance ()->getProfiles (rtengine::ICCStore::ProfileType::PRINTER);
|
||||
|
||||
for (const auto prtprofile : prtprofiles) {
|
||||
for (const auto& prtprofile : prtprofiles) {
|
||||
prtProfile->append (prtprofile);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user