[Bf-blender-cvs] SVN commit: /data/svn/repos/bf-blender [61890] trunk/lib/darwin-9.x.universal/opencolorio: MacOS 10.6+ [x86_64] OpenColorIO githash:6de971097c7f552300f669ed69ca0b6cf5a70843

[Martijn Berger]

Revision: 61890
          https://developer.blender.org/rBL61890
Author:   juicyfruit
Date:     2017-05-29 14:20:53 +0200 (Mon, 29 May 2017)
Log Message:
-----------
MacOS 10.6+ [x86_64] OpenColorIO githash:6de971097c7f552300f669ed69ca0b6cf5a70843

Modified Paths:
--------------
    trunk/lib/darwin-9.x.universal/opencolorio/include/OpenColorIO/OpenColorABI.h
    trunk/lib/darwin-9.x.universal/opencolorio/include/OpenColorIO/OpenColorIO.h
    trunk/lib/darwin-9.x.universal/opencolorio/lib/libOpenColorIO.a

Modified: trunk/lib/darwin-9.x.universal/opencolorio/include/OpenColorIO/OpenColorABI.h
===================================================================
--- trunk/lib/darwin-9.x.universal/opencolorio/include/OpenColorIO/OpenColorABI.h	2017-05-29 11:25:55 UTC (rev 61889)
+++ trunk/lib/darwin-9.x.universal/opencolorio/include/OpenColorIO/OpenColorABI.h	2017-05-29 12:20:53 UTC (rev 61890)
@@ -55,6 +55,10 @@
 #include <boost/shared_ptr.hpp>
 #define OCIO_SHARED_PTR boost::shared_ptr
 #define OCIO_DYNAMIC_POINTER_CAST boost::dynamic_pointer_cast
+#elif defined(_LIBCPP_VERSION)
+#include <memory>
+#define OCIO_SHARED_PTR std::shared_ptr
+#define OCIO_DYNAMIC_POINTER_CAST std::dynamic_pointer_cast
 #elif __GNUC__ >= 4
 #include <tr1/memory>
 #define OCIO_SHARED_PTR std::tr1::shared_ptr
@@ -65,7 +69,7 @@
 
 // If supported, define OCIOEXPORT, OCIOHIDDEN
 // (used to choose which symbols to export from OpenColorIO)
-#if defined __linux__ || __APPLE__ || __FreeBSD__
+#if defined __GNUC__
     #if __GNUC__ >= 4
         #define OCIOEXPORT __attribute__ ((visibility("default")))
         #define OCIOHIDDEN __attribute__ ((visibility("hidden")))

Modified: trunk/lib/darwin-9.x.universal/opencolorio/include/OpenColorIO/OpenColorIO.h
===================================================================
--- trunk/lib/darwin-9.x.universal/opencolorio/include/OpenColorIO/OpenColorIO.h	2017-05-29 11:25:55 UTC (rev 61889)
+++ trunk/lib/darwin-9.x.universal/opencolorio/include/OpenColorIO/OpenColorIO.h	2017-05-29 12:20:53 UTC (rev 61890)
@@ -279,6 +279,12 @@
         const char * getEnvironmentVarDefault(const char * name) const;
         //!cpp:function::
         void clearEnvironmentVars();
+        //!cpp:function::
+        void setEnvironmentMode(EnvironmentMode mode);
+        //!cpp:function::
+        EnvironmentMode getEnvironmentMode() const;
+        //!cpp:function::
+        void loadEnvironment();
         
         //!cpp:function::
         const char * getSearchPath() const;
@@ -726,6 +732,11 @@
         ConstTransformRcPtr getInverseTransform() const;
         //!cpp:function:: Setting a transform to a non-null call makes it allowed.
         void setInverseTransform(const ConstTransformRcPtr & transform);
+
+        //!cpp:function::
+        const char * getDescription() const;
+        //!cpp:function::
+        void setDescription(const char * description);
     private:
         Look();
         ~Look();

Modified: trunk/lib/darwin-9.x.universal/opencolorio/lib/libOpenColorIO.a
===================================================================
(Binary files differ)