diff --git a/rtengine/improcfun.cc b/rtengine/improcfun.cc index 301201b65..ea318172c 100644 --- a/rtengine/improcfun.cc +++ b/rtengine/improcfun.cc @@ -193,6 +193,7 @@ void ImProcFunctions::firstAnalysis (Imagefloat* original, const ProcParams* par cmsDeleteTransform (monitorTransform); monitorTransform = NULL; +#if !defined(__APPLE__) // No support for monitor profiles on OS X, all data is sRGB Glib::ustring monitorProfile=settings->monitorProfile; if (settings->autoMonitorProfile) monitorProfile=iccStore->defaultMonitorProfile; @@ -204,7 +205,7 @@ void ImProcFunctions::firstAnalysis (Imagefloat* original, const ProcParams* par cmsFLAGS_NOOPTIMIZE | cmsFLAGS_NOCACHE ); // NOCACHE is for thread safety, NOOPTIMIZE for precision lcmsMutex->unlock (); } - +#endif // calculate histogram of the y channel needed for contrast curve calculation in exposure adjustments int T = 1; diff --git a/rtgui/preferences.cc b/rtgui/preferences.cc index 92da78998..d6aaf8bc5 100644 --- a/rtgui/preferences.cc +++ b/rtgui/preferences.cc @@ -507,9 +507,11 @@ Gtk::Widget* Preferences::getColorManagementPanel () { colt->attach (*intent, 1, 2, 0, 1, Gtk::EXPAND | Gtk::FILL | Gtk::SHRINK, Gtk::SHRINK, 2, 2); colt->attach (*pdlabel, 0, 1, 1, 2, Gtk::FILL, Gtk::SHRINK, 2, 2); colt->attach (*iccDir, 1, 2, 1, 2, Gtk::EXPAND | Gtk::FILL | Gtk::SHRINK, Gtk::SHRINK, 2, 2); +#if !defined(__APPLE__) // monitor profile not supported on apple colt->attach (*mplabel, 0, 1, 2, 3, Gtk::FILL, Gtk::SHRINK, 2, 2); colt->attach (*monProfile, 1, 2, 2, 3, Gtk::EXPAND | Gtk::FILL | Gtk::SHRINK, Gtk::SHRINK, 2, 2); colt->attach (*cbAutoMonProfile, 1, 2, 3, 4, Gtk::EXPAND | Gtk::FILL | Gtk::SHRINK, Gtk::SHRINK, 2, 2); +#endif mvbcm->pack_start (*colt, Gtk::PACK_SHRINK, 4); autoMonProfileToggled(); @@ -1233,11 +1235,13 @@ void Preferences::fillPreferences () { forImageComboChanged(); // update the tooltip dateformat->set_text (moptions.dateFormat); panFactor->set_value(moptions.panAccelFactor); +#if !defined(__APPLE__) // monitor profile not supported on apple if (safe_file_test (moptions.rtSettings.monitorProfile, Glib::FILE_TEST_EXISTS)) monProfile->set_filename (moptions.rtSettings.monitorProfile); if (moptions.rtSettings.monitorProfile.empty()) monProfile->set_current_folder (moptions.rtSettings.iccDirectory); cbAutoMonProfile->set_active(moptions.rtSettings.autoMonitorProfile); +#endif if (Glib::file_test (moptions.rtSettings.iccDirectory, Glib::FILE_TEST_IS_DIR)) iccDir->set_current_folder (moptions.rtSettings.iccDirectory);