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

merge with Dev

Browse Source
This commit is contained in:
Desmis
2017-02-16 08:08:10 +01:00
parent 894fcf5734 9c4bba1af8
commit 2fd4f58345
2 changed files with 58 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
rtengine/clutstore.cc
View File

@@ -307,12 +307,17 @@ std::shared_ptr<rtengine::HaldCLUT> rtengine::CLUTStore::getClut(const Glib::ust
{
std::shared_ptr<rtengine::HaldCLUT> result;
if (!cache.get(filename, result)) {
const Glib::ustring full_filename =
!Glib::path_is_absolute(filename)
? Glib::ustring(Glib::build_filename(options.clutsDir, filename))
: filename;
if (!cache.get(full_filename, result)) {
std::unique_ptr<rtengine::HaldCLUT> clut(new rtengine::HaldCLUT);
if (clut->load(filename)) {
if (clut->load(full_filename)) {
result = std::move(clut);
cache.insert(filename, result);
cache.insert(full_filename, result);
}
}