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

Fixed input profile handling for non-raw images, issue 2801

Browse Source
This commit is contained in:
DrSlony
2015-06-05 16:54:03 +02:00
parent c5db6f66eb
commit c6990dc783
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rtgui/icmpanel.cc
View File

@@ -372,7 +372,7 @@ void ICMPanel::read (const ProcParams* pp, const ParamsEdited* pedited) {
if(pp->icm.input.substr(0,5) != "file:" && !ipDialog->get_filename().empty()) if(pp->icm.input.substr(0,5) != "file:" && !ipDialog->get_filename().empty())
ipDialog->set_filename(pp->icm.input); ipDialog->set_filename(pp->icm.input);
if (pp->icm.input == "(none)" && icamera->get_state()!=Gtk::STATE_INSENSITIVE) { if (pp->icm.input == "(none)") {
inone->set_active (true); inone->set_active (true);
ckbBlendCMSMatrix->set_sensitive (false); ckbBlendCMSMatrix->set_sensitive (false);
updateDCP(pp->icm.dcpIlluminant, ""); updateDCP(pp->icm.dcpIlluminant, "");
@@ -387,13 +387,19 @@ void ICMPanel::read (const ProcParams* pp, const ParamsEdited* pedited) {
ckbBlendCMSMatrix->set_sensitive (true); ckbBlendCMSMatrix->set_sensitive (true);
updateDCP(pp->icm.dcpIlluminant, ""); updateDCP(pp->icm.dcpIlluminant, "");
} }
else if ((pp->icm.input == "(cameraICC)") && icameraICC->get_state()==Gtk::STATE_INSENSITIVE) { else if ((pp->icm.input == "(cameraICC)") && icamera->get_state()!=Gtk::STATE_INSENSITIVE && icameraICC->get_state()==Gtk::STATE_INSENSITIVE) {
// this is the case when (cameraICC) is instructed by packaged profiles, but ICC file is not found // this is the case when (cameraICC) is instructed by packaged profiles, but ICC file is not found
// therefore falling back UI to explicitly reflect the (camera) option // therefore falling back UI to explicitly reflect the (camera) option
icamera->set_active (true); icamera->set_active (true);
ckbBlendCMSMatrix->set_sensitive (false); ckbBlendCMSMatrix->set_sensitive (false);
updateDCP(pp->icm.dcpIlluminant, ""); updateDCP(pp->icm.dcpIlluminant, "");
} }
else if ((pp->icm.input == "(cameraICC)") && icamera->get_state()==Gtk::STATE_INSENSITIVE && icameraICC->get_state()==Gtk::STATE_INSENSITIVE) {
// If neither (camera) nor (cameraICC) are available, as is the case when loading a non-raw, activate (embedded).
iembedded->set_active (true);
ckbBlendCMSMatrix->set_sensitive (false);
updateDCP(pp->icm.dcpIlluminant, "");
}
else if ((pp->icm.input == "(camera)" || pp->icm.input=="") && icamera->get_state()!=Gtk::STATE_INSENSITIVE) { else if ((pp->icm.input == "(camera)" || pp->icm.input=="") && icamera->get_state()!=Gtk::STATE_INSENSITIVE) {
icamera->set_active (true); icamera->set_active (true);
ckbBlendCMSMatrix->set_sensitive (false); ckbBlendCMSMatrix->set_sensitive (false);