Revision: 61863 https://developer.blender.org/rBL61863 Author: jensverwiebe Date: 2017-04-26 20:43:02 +0200 (Wed, 26 Apr 2017) Log Message: ----------- OSX: update ocio to 1.0.9
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/include/OpenColorIO/OpenColorTypes.h trunk/lib/darwin-9.x.universal/opencolorio/lib/libOpenColorIO.a trunk/lib/darwin-9.x.universal/opencolorio/lib/libtinyxml.a trunk/lib/darwin-9.x.universal/opencolorio/lib/libyaml-cpp.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-04-26 15:44:39 UTC (rev 61862) +++ trunk/lib/darwin-9.x.universal/opencolorio/include/OpenColorIO/OpenColorABI.h 2017-04-26 18:43:02 UTC (rev 61863) @@ -32,7 +32,7 @@ // Makefile configuration options #define OCIO_NAMESPACE OpenColorIO #define OCIO_USE_BOOST_PTR 0 -#define OCIO_VERSION "1.0.7" +#define OCIO_VERSION "1.0.9" #define OCIO_VERSION_NS v1 /* Version as a single 4-byte hex number, e.g. 0x01050200 == 1.5.2 @@ -42,7 +42,7 @@ */ #define OCIO_VERSION_HEX ((1 << 24) | \ (0 << 16) | \ - (7 << 8)) + (9 << 8)) // Namespace / version mojo @@ -65,7 +65,7 @@ // If supported, define OCIOEXPORT, OCIOHIDDEN // (used to choose which symbols to export from OpenColorIO) -#if defined __linux__ || __APPLE__ +#if defined __linux__ || __APPLE__ || __FreeBSD__ #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-04-26 15:44:39 UTC (rev 61862) +++ trunk/lib/darwin-9.x.universal/opencolorio/include/OpenColorIO/OpenColorIO.h 2017-04-26 18:43:02 UTC (rev 61863) @@ -270,11 +270,24 @@ ConstContextRcPtr getCurrentContext() const; //!cpp:function:: + void addEnvironmentVar(const char * name, const char * defaultValue); + //!cpp:function:: + int getNumEnvironmentVars() const; + //!cpp:function:: + const char * getEnvironmentVarNameByIndex(int index) const; + //!cpp:function:: + const char * getEnvironmentVarDefault(const char * name) const; + //!cpp:function:: + void clearEnvironmentVars(); + + //!cpp:function:: const char * getSearchPath() const; + //!cpp:function:: void setSearchPath(const char * path); //!cpp:function:: const char * getWorkingDir() const; + //!cpp:function:: void setWorkingDir(const char * dirname); /////////////////////////////////////////////////////////////////////////// @@ -933,6 +946,14 @@ void setShaperSpace(const char * shaperSpace); //!cpp:function:: get the shaper colorspace that has been set const char * getShaperSpace() const; + + //!cpp:function:: set the looks to be applied during baking + // Looks is a potentially comma (or colon) delimited list of lookNames, + // Where +/- prefixes are optionally allowed to denote forward/inverse + // look specification. (And forward is assumed in the absense of either) + void setLooks(const char * looks); + //!cpp:function:: get the looks to be applied during baking + const char * getLooks() const; //!cpp:function:: set the target device colorspace for the lut void setTargetSpace(const char * targetSpace); @@ -1187,9 +1208,20 @@ //!cpp:function:: const char * getStringVar(const char * name) const; + //!cpp:function:: int getNumStringVars() const; + //!cpp:function:: const char * getStringVarNameByIndex(int index) const; + //!cpp:function:: + void clearStringVars(); + + //!cpp:function:: + void setEnvironmentMode(EnvironmentMode mode); + + //!cpp:function:: + EnvironmentMode getEnvironmentMode() const; + //!cpp:function:: Seed all string vars with the current environment. void loadEnvironment(); Modified: trunk/lib/darwin-9.x.universal/opencolorio/include/OpenColorIO/OpenColorTypes.h =================================================================== --- trunk/lib/darwin-9.x.universal/opencolorio/include/OpenColorIO/OpenColorTypes.h 2017-04-26 15:44:39 UTC (rev 61862) +++ trunk/lib/darwin-9.x.universal/opencolorio/include/OpenColorIO/OpenColorTypes.h 2017-04-26 18:43:02 UTC (rev 61863) @@ -266,6 +266,13 @@ GPU_LANGUAGE_GLSL_1_3 ///< OpenGL Shading Language }; + //!cpp:type:: + enum EnvironmentMode + { + ENV_ENVIRONMENT_UNKNOWN = 0, + ENV_ENVIRONMENT_LOAD_PREDEFINED, + ENV_ENVIRONMENT_LOAD_ALL + }; //!rst:: // Conversion @@ -321,7 +328,12 @@ //!cpp:function:: extern OCIOEXPORT GpuLanguage GpuLanguageFromString(const char * s); + //!cpp:function:: + extern OCIOEXPORT const char * EnvironmentModeToString(EnvironmentMode mode); + //!cpp:function:: + extern OCIOEXPORT EnvironmentMode EnvironmentModeFromString(const char * s); + /*!rst:: Roles ***** Modified: trunk/lib/darwin-9.x.universal/opencolorio/lib/libOpenColorIO.a =================================================================== (Binary files differ) Modified: trunk/lib/darwin-9.x.universal/opencolorio/lib/libtinyxml.a =================================================================== (Binary files differ) Modified: trunk/lib/darwin-9.x.universal/opencolorio/lib/libyaml-cpp.a =================================================================== (Binary files differ) _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs