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

Fixed auto profile detection in some cases

Browse Source 
see issue 1312
This commit is contained in:
Oliver Duis 2012-04-19 21:25:01 +02:00
parent 0db92a7f88
commit a5fec87ad5
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
rtengine/dcp.cc
View File

@ -443,10 +443,13 @@ DCPProfile* DCPStore::getProfile (Glib::ustring filename) {
} }
DCPProfile* DCPStore::getStdProfile(Glib::ustring camShortName) { DCPProfile* DCPStore::getStdProfile(Glib::ustring camShortName) {
std::map<Glib::ustring, Glib::ustring>::iterator r = fileStdProfiles.find (camShortName.uppercase()); Glib::ustring name2=camShortName.uppercase();
if (r==fileStdProfiles.end()) return NULL;
return getProfile(r->second); // Warning: do NOT use map.find(), since it does not seem to work reliably here
for (std::map<Glib::ustring, Glib::ustring>::iterator i=fileStdProfiles.begin();i!=fileStdProfiles.end();i++)
if (name2==(*i).first) return getProfile((*i).second);
return NULL;
} }
bool DCPStore::isValidDCPFileName(Glib::ustring filename) const { bool DCPStore::isValidDCPFileName(Glib::ustring filename) const {