[Bf-blender-cvs] [0152bf2edfd] blender2.7: Color management: Fix/workaround broken getDefaultDisplay()
Sergey Sharybin
noreply at git.blender.org
Mon Mar 11 11:30:08 CET 2019
Commit: 0152bf2edfdcc3288d57445511f9fd58b153d5a3
Author: Sergey Sharybin
Date: Wed Dec 5 13:34:04 2018 +0100
Branches: blender2.7
https://developer.blender.org/rB0152bf2edfdcc3288d57445511f9fd58b153d5a3
Color management: Fix/workaround broken getDefaultDisplay()
This is something what is caused by OCIO library. The patch
has been submitted there:
https://github.com/imageworks/OpenColorIO/pull/638
For until it is refined and checked we do workaround from
our side.
===================================================================
M intern/opencolorio/ocio_impl.cc
===================================================================
diff --git a/intern/opencolorio/ocio_impl.cc b/intern/opencolorio/ocio_impl.cc
index 23a883d5f3d..5e4a6146084 100644
--- a/intern/opencolorio/ocio_impl.cc
+++ b/intern/opencolorio/ocio_impl.cc
@@ -47,6 +47,18 @@ using namespace OCIO_NAMESPACE;
# define __func__ __FUNCTION__
#endif
+/* NOTE: This is because OCIO 1.1.0 has a bug which makes default
+ * display to be the one which is first alphabetically.
+ *
+ * Fix has been submitted as a patch
+ * https://github.com/imageworks/OpenColorIO/pull/638
+ *
+ * For until then we use first usable display instead. */
+#define DEFAULT_DISPLAY_WORKAROUND
+#ifdef DEFAULT_DISPLAY_WORKAROUND
+# include <mutex>
+#endif
+
static void OCIO_reportError(const char *err)
{
std::cerr << "OpenColorIO Error: " << err << std::endl;
@@ -189,6 +201,28 @@ int OCIOImpl::configGetIndexForColorSpace(OCIO_ConstConfigRcPtr *config, const c
const char *OCIOImpl::configGetDefaultDisplay(OCIO_ConstConfigRcPtr *config)
{
+#ifdef DEFAULT_DISPLAY_WORKAROUND
+ 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;
+ }
+ 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
+
try {
return (*(ConstConfigRcPtr *) config)->getDefaultDisplay();
}
@@ -225,6 +259,29 @@ const char *OCIOImpl::configGetDisplay(OCIO_ConstConfigRcPtr *config, int index)
const char *OCIOImpl::configGetDefaultView(OCIO_ConstConfigRcPtr *config, const char *display)
{
+#ifdef DEFAULT_DISPLAY_WORKAROUND
+ /* NOTE: We assume that first active view always exists for a default
+ * display. */
+ 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;
+ }
+ 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 {
return (*(ConstConfigRcPtr *) config)->getDefaultView(display);
}
More information about the Bf-blender-cvs
mailing list