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

Fixed crash on selecting a Custom input color profile

Browse Source 
see issue 1298
This commit is contained in:
Oliver Duis
2012-04-01 17:18:48 +02:00
parent fa33a880e7
commit 7d621effc7
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rtengine/dcp.cc
View File

@@ -453,6 +453,7 @@ DCPProfile* DCPStore::getStdProfile(Glib::ustring camShortName) {
} }
bool DCPStore::isValidDCPFileName(Glib::ustring filename) const { bool DCPStore::isValidDCPFileName(Glib::ustring filename) const {
return safe_file_test (filename, Glib::FILE_TEST_EXISTS) if (!safe_file_test (filename, Glib::FILE_TEST_EXISTS) || safe_file_test (filename, Glib::FILE_TEST_IS_DIR)) return false;
&& !filename.casefold().compare (filename.find_last_of ('.'), 4, ".dcp"); int pos=filename.find_last_of ('.');
return pos>0 && !filename.casefold().compare (pos, 4, ".dcp");
} }

3
rtgui/icmpanel.cc
View File

@@ -283,7 +283,10 @@ void ICMPanel::write (ProcParams* pp, ParamsEdited* pedited) {
else if (icameraICC->get_active ()) else if (icameraICC->get_active ())
pp->icm.input = "(cameraICC)"; pp->icm.input = "(cameraICC)";
else { else {
if (safe_file_test (ipDialog->get_filename (), Glib::FILE_TEST_EXISTS) && !safe_file_test (ipDialog->get_filename (), Glib::FILE_TEST_IS_DIR))
pp->icm.input = "file:"+ipDialog->get_filename (); pp->icm.input = "file:"+ipDialog->get_filename ();
else
pp->icm.input = ""; // just a directory
Glib::ustring p=Glib::path_get_dirname(ipDialog->get_filename ()); Glib::ustring p=Glib::path_get_dirname(ipDialog->get_filename ());
if (p!=options.rtSettings.iccDirectory) { if (p!=options.rtSettings.iccDirectory) {