merge with dev

This commit is contained in:
Desmis
2020-02-06 11:44:03 +01:00
41 changed files with 2286 additions and 1021 deletions

View File

@@ -80,6 +80,7 @@ public:
// bool bw_complementary;
double level0_cbdl;
double level123_cbdl;
Glib::ustring lensfunDbDirectory; // The directory containing the lensfun database. If empty, the system defaults will be used, as described in https://lensfun.github.io/manual/latest/dbsearch.html
int itcwb_thres;
bool itcwb_sort;
int itcwb_greenrange;
@@ -88,7 +89,6 @@ public:
int itcwb_sizereference;
int itcwb_delta;
Glib::ustring lensfunDbDirectory; ///< The directory containing the lensfun database. If empty, the system defaults will be used (as described in http://lensfun.sourceforge.net/manual/dbsearch.html)
enum class ThumbnailInspectorMode {
JPEG,