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

Support for ICC profiles in subdirectories

Browse Source 
see issue #1286
This commit is contained in:
Oliver Duis
2012-03-22 19:12:20 +01:00
parent 9da3425f78
commit 33288c09e8
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
rtengine/iccstore.cc
View File

@@ -213,8 +213,15 @@ void ICCStore::init (Glib::ustring usrICCDir, Glib::ustring rtICCDir) {
void ICCStore::loadICCs(Glib::ustring rootDirName, bool nameUpper, std::map<std::string, cmsHPROFILE>& resultProfiles, std::map<std::string, ProfileContent> &resultProfileContents) { void ICCStore::loadICCs(Glib::ustring rootDirName, bool nameUpper, std::map<std::string, cmsHPROFILE>& resultProfiles, std::map<std::string, ProfileContent> &resultProfileContents) {
if (rootDirName!="") { if (rootDirName!="") {
std::deque<Glib::ustring> qDirs;
qDirs.push_front(rootDirName);
while (qDirs.size()) {
// process directory // process directory
Glib::ustring dirname = rootDirName; Glib::ustring dirname = qDirs.back();
qDirs.pop_back();
Glib::Dir* dir = NULL; Glib::Dir* dir = NULL;
try { try {
if (!safe_file_test (dirname, Glib::FILE_TEST_IS_DIR)) return; if (!safe_file_test (dirname, Glib::FILE_TEST_IS_DIR)) return;
@@ -241,11 +248,12 @@ void ICCStore::loadICCs(Glib::ustring rootDirName, bool nameUpper, std::map<std:
} }
} }
} }
} } else qDirs.push_front(fname); // for later scanning
} }
delete dir; delete dir;
} }
} }
}
// Determine the first monitor default profile of operating system, if selected // Determine the first monitor default profile of operating system, if selected
void ICCStore::findDefaultMonitorProfile() { void ICCStore::findDefaultMonitorProfile() {