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

Scan clut folder: Don't check for unused profile

Browse Source
This commit is contained in:
heckflosse 2019-05-13 23:12:40 +02:00
parent ea2e9dd274
commit 141e9f632f
3 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
rtengine/clutstore.cc
View File

@ -270,7 +270,8 @@ void rtengine::HaldCLUT::splitClutFilename(
const Glib::ustring& filename, const Glib::ustring& filename,
Glib::ustring& name, Glib::ustring& name,
Glib::ustring& extension, Glib::ustring& extension,
Glib::ustring& profile_name Glib::ustring& profile_name,
bool checkProfile
) )
{ {
Glib::ustring basename = Glib::path_get_basename(filename); Glib::ustring basename = Glib::path_get_basename(filename);
@ -284,17 +285,19 @@ void rtengine::HaldCLUT::splitClutFilename(
name = basename; name = basename;
} }
profile_name = "sRGB"; if (checkProfile) {
profile_name = "sRGB";
if (!name.empty()) { if (!name.empty()) {
for (const auto& working_profile : rtengine::ICCStore::getInstance()->getWorkingProfiles()) { for (const auto& working_profile : rtengine::ICCStore::getInstance()->getWorkingProfiles()) {
if ( if (
!working_profile.empty() // This isn't strictly needed, but an empty wp name should be skipped anyway !working_profile.empty() // This isn't strictly needed, but an empty wp name should be skipped anyway
&& std::search(name.rbegin(), name.rend(), working_profile.rbegin(), working_profile.rend()) == name.rbegin() && std::search(name.rbegin(), name.rend(), working_profile.rbegin(), working_profile.rend()) == name.rbegin()
) { ) {
profile_name = working_profile; profile_name = working_profile;
name.erase(name.size() - working_profile.size()); name.erase(name.size() - working_profile.size());
break; break;
}
} }
} }
} }

3
rtengine/clutstore.h
View File

@ -39,7 +39,8 @@ public:
const Glib::ustring& filename, const Glib::ustring& filename,
Glib::ustring& name, Glib::ustring& name,
Glib::ustring& extension, Glib::ustring& extension,
Glib::ustring& profile_name Glib::ustring& profile_name,
bool checkProfile = true
); );
private: private:

2
rtgui/filmsimulation.cc
View File

@ -393,7 +393,7 @@ int ClutComboBox::ClutModel::parseDir(const Glib::ustring& path)
Glib::ustring name; Glib::ustring name;
Glib::ustring extension; Glib::ustring extension;
Glib::ustring profileName; Glib::ustring profileName;
HaldCLUT::splitClutFilename (entry, name, extension, profileName); HaldCLUT::splitClutFilename (entry, name, extension, profileName, false);
extension = extension.casefold(); extension = extension.casefold();
if (extension != "png" && extension != "tif") { if (extension != "png" && extension != "tif") {