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

Merge branch 'dev' into fix-double-promotion

Browse Source
This commit is contained in:
Ingo Weyrich
2020-02-09 16:45:20 +01:00
parent 914daffa39 0aec0fe0e9
commit b627adea3a
145 changed files with 4907 additions and 3828 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rtengine/camconst.cc
View File

@@ -638,7 +638,7 @@ CameraConst::update_globalGreenEquilibration(bool other)
}
bool
CameraConstantsStore::parse_camera_constants_file(Glib::ustring filename_)
CameraConstantsStore::parse_camera_constants_file(const Glib::ustring& filename_)
{
// read the file into a single long string
const char *filename = filename_.c_str();
@@ -809,7 +809,7 @@ CameraConstantsStore::~CameraConstantsStore()
}
}
void CameraConstantsStore::init(Glib::ustring baseDir, Glib::ustring userSettingsDir)
void CameraConstantsStore::init(const Glib::ustring& baseDir, const Glib::ustring& userSettingsDir)
{
parse_camera_constants_file(Glib::build_filename(baseDir, "camconst.json"));