kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Color management: Fix issue when active views/displays are not specified

Browse Source
This commit is contained in:
Sergey Sharybin 2018-12-06 09:16:52 +01:00
parent ca2680aaeb
commit a60536956e
1 changed files with 33 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
intern/opencolorio/ocio_impl.cc
View File

@ -213,21 +213,24 @@ const char *OCIOImpl::configGetDefaultDisplay(OCIO_ConstConfigRcPtr *config)
if (getenv("OCIO_ACTIVE_DISPLAYS") == NULL) {
const char *active_displays =
(*(ConstConfigRcPtr *) config)->getActiveDisplays();
const char *separator_pos = strchr(active_displays, ',');
if (separator_pos == NULL) {
return active_displays;
if (active_displays[0] != '\0') {
const char *separator_pos = strchr(active_displays, ',');
if (separator_pos == NULL) {
return active_displays;
}
static std::string active_display;
/* NOTE: Configuration is shared and is never changed during
* runtime, so we only guarantee two threads don't initialize at the
* same. */
static std::mutex mutex;
mutex.lock();
if (active_display.empty()) {
active_display = active_displays;
active_display[separator_pos - active_displays] = '\0';
}
mutex.unlock();
return active_display.c_str();
}
static std::string active_display;
/* NOTE: Configuration is shared and is never changed during runtime,
* so we only guarantee two threads don't initialize at the same. */
static std::mutex mutex;
mutex.lock();
if (active_display.empty()) {
active_display = active_displays;
active_display[separator_pos - active_displays] = '\0';
}
mutex.unlock();
return active_display.c_str();
}
#endif
@ -273,21 +276,23 @@ const char *OCIOImpl::configGetDefaultView(OCIO_ConstConfigRcPtr *config, const
if (getenv("OCIO_ACTIVE_VIEWS") == NULL) {
const char *active_views =
(*(ConstConfigRcPtr *) config)->getActiveViews();
const char *separator_pos = strchr(active_views, ',');
if (separator_pos == NULL) {
return active_views;
if (active_views[0] != '\0') {
const char *separator_pos = strchr(active_views, ',');
if (separator_pos == NULL) {
return active_views;
}
static std::string active_view;
/* NOTE: Configuration is shared and is never changed during runtime,
* so we only guarantee two threads don't initialize at the same. */
static std::mutex mutex;
mutex.lock();
if (active_view.empty()) {
active_view = active_views;
active_view[separator_pos - active_views] = '\0';
}
mutex.unlock();
return active_view.c_str();
}
static std::string active_view;
/* NOTE: Configuration is shared and is never changed during runtime,
* so we only guarantee two threads don't initialize at the same. */
static std::mutex mutex;
mutex.lock();
if (active_view.empty()) {
active_view = active_views;
active_view[separator_pos - active_views] = '\0';
}
mutex.unlock();
return active_view.c_str();
}
#endif
try {