[Bf-blender-cvs] SVN commit: /data/svn/repos/bf-blender [61609] trunk/lib/windows_vc12/ OpenColorIO: MSVC 2013 windows x32 (vc120_xp, windows XP compatible) OCIO rebuild for boost

[Martijn Berger]

Revision: 61609
          https://developer.blender.org/rBL61609
Author:   juicyfruit
Date:     2016-01-26 16:29:06 +0000 (Tue, 26 Jan 2016)
Log Message:
-----------
MSVC 2013 windows x32 (vc120_xp, windows XP compatible)  OCIO rebuild for boost

Modified Paths:
--------------
    trunk/lib/windows_vc12/OpenColorIO/bin/OpenColorIO.dll
    trunk/lib/windows_vc12/OpenColorIO/build.bat
    trunk/lib/windows_vc12/OpenColorIO/include/OpenColorIO/OpenColorABI.h
    trunk/lib/windows_vc12/OpenColorIO/include/OpenColorIO/OpenColorIO.h
    trunk/lib/windows_vc12/OpenColorIO/include/OpenColorIO/OpenColorTypes.h
    trunk/lib/windows_vc12/OpenColorIO/lib/OpenColorIO.dll
    trunk/lib/windows_vc12/OpenColorIO/lib/OpenColorIO.lib
    trunk/lib/windows_vc12/OpenColorIO/lib/pkgconfig/OpenColorIO.pc

Modified: trunk/lib/windows_vc12/OpenColorIO/bin/OpenColorIO.dll
===================================================================
(Binary files differ)

Modified: trunk/lib/windows_vc12/OpenColorIO/build.bat
===================================================================
--- trunk/lib/windows_vc12/OpenColorIO/build.bat	2016-01-26 15:40:57 UTC (rev 61608)
+++ trunk/lib/windows_vc12/OpenColorIO/build.bat	2016-01-26 16:29:06 UTC (rev 61609)
@@ -1,9 +1,10 @@
 @Echo off
 
-cd imageworks-OpenColorIO-8883824
+set LIBDIR=%CD%\..
 
-set LIBDIR=%CD%\..\..
+cd OpenColorIO-1.0.9
 
+
 :: create build directory
 
 echo Libdir set to: %LIBDIR%
@@ -34,7 +35,7 @@
 nmake
 nmake install
 
-cd ../../..
+cd %LIBDIR%\opencolorio
 mkdir bin
 copy /Y lib\OpenColorIO.dll bin\
 

Modified: trunk/lib/windows_vc12/OpenColorIO/include/OpenColorIO/OpenColorABI.h
===================================================================
--- trunk/lib/windows_vc12/OpenColorIO/include/OpenColorIO/OpenColorABI.h	2016-01-26 15:40:57 UTC (rev 61608)
+++ trunk/lib/windows_vc12/OpenColorIO/include/OpenColorIO/OpenColorABI.h	2016-01-26 16:29:06 UTC (rev 61609)
@@ -32,7 +32,7 @@
 // Makefile configuration options
 #define OCIO_NAMESPACE OpenColorIO
 #define OCIO_USE_BOOST_PTR 1
-#define OCIO_VERSION "1.0.8"
+#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) | \
-                          (8 <<  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/windows_vc12/OpenColorIO/include/OpenColorIO/OpenColorIO.h
===================================================================
--- trunk/lib/windows_vc12/OpenColorIO/include/OpenColorIO/OpenColorIO.h	2016-01-26 15:40:57 UTC (rev 61608)
+++ trunk/lib/windows_vc12/OpenColorIO/include/OpenColorIO/OpenColorIO.h	2016-01-26 16:29:06 UTC (rev 61609)
@@ -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);
         
         ///////////////////////////////////////////////////////////////////////////
@@ -1195,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/windows_vc12/OpenColorIO/include/OpenColorIO/OpenColorTypes.h
===================================================================
--- trunk/lib/windows_vc12/OpenColorIO/include/OpenColorIO/OpenColorTypes.h	2016-01-26 15:40:57 UTC (rev 61608)
+++ trunk/lib/windows_vc12/OpenColorIO/include/OpenColorIO/OpenColorTypes.h	2016-01-26 16:29:06 UTC (rev 61609)
@@ -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/windows_vc12/OpenColorIO/lib/OpenColorIO.dll
===================================================================
(Binary files differ)

Modified: trunk/lib/windows_vc12/OpenColorIO/lib/OpenColorIO.lib
===================================================================
(Binary files differ)

Modified: trunk/lib/windows_vc12/OpenColorIO/lib/pkgconfig/OpenColorIO.pc
===================================================================
--- trunk/lib/windows_vc12/OpenColorIO/lib/pkgconfig/OpenColorIO.pc	2016-01-26 15:40:57 UTC (rev 61608)
+++ trunk/lib/windows_vc12/OpenColorIO/lib/pkgconfig/OpenColorIO.pc	2016-01-26 16:29:06 UTC (rev 61609)
@@ -5,6 +5,6 @@
 
 Name: OpenColorIO
 Description: A color management framework for visual effects and animation
-Version: 1.0.8
+Version: 1.0.9
 Cflags: -I${includedir}
 Libs: -L${libdir} -lOpenColorIO