[Bf-blender-cvs] SVN commit: /data/svn/repos/bf-blender [61592] trunk/lib/win64_vc14/ OpenColorIO: MSVC 2015 windows x64 OpenColorIO
Martijn Berger
martijn.berger at gmail.com
Tue Jan 12 16:20:19 CET 2016
Revision: 61592
https://developer.blender.org/rBL61592
Author: juicyfruit
Date: 2016-01-12 15:20:18 +0000 (Tue, 12 Jan 2016)
Log Message:
-----------
MSVC 2015 windows x64 OpenColorIO
Added Paths:
-----------
trunk/lib/win64_vc14/OpenColorIO/
trunk/lib/win64_vc14/OpenColorIO/bin/
trunk/lib/win64_vc14/OpenColorIO/bin/OpenColorIO.dll
trunk/lib/win64_vc14/OpenColorIO/build.bat
trunk/lib/win64_vc14/OpenColorIO/include/
trunk/lib/win64_vc14/OpenColorIO/include/OpenColorIO/
trunk/lib/win64_vc14/OpenColorIO/include/OpenColorIO/OpenColorABI.h
trunk/lib/win64_vc14/OpenColorIO/include/OpenColorIO/OpenColorIO.h
trunk/lib/win64_vc14/OpenColorIO/include/OpenColorIO/OpenColorTransforms.h
trunk/lib/win64_vc14/OpenColorIO/include/OpenColorIO/OpenColorTypes.h
trunk/lib/win64_vc14/OpenColorIO/lib/
trunk/lib/win64_vc14/OpenColorIO/lib/OpenColorIO.dll
trunk/lib/win64_vc14/OpenColorIO/lib/OpenColorIO.lib
trunk/lib/win64_vc14/OpenColorIO/msvc_2015_mt.patch
Added: trunk/lib/win64_vc14/OpenColorIO/bin/OpenColorIO.dll
===================================================================
(Binary files differ)
Index: trunk/lib/win64_vc14/OpenColorIO/bin/OpenColorIO.dll
===================================================================
--- trunk/lib/win64_vc14/OpenColorIO/bin/OpenColorIO.dll 2016-01-05 12:55:05 UTC (rev 61591)
+++ trunk/lib/win64_vc14/OpenColorIO/bin/OpenColorIO.dll 2016-01-12 15:20:18 UTC (rev 61592)
Property changes on: trunk/lib/win64_vc14/OpenColorIO/bin/OpenColorIO.dll
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/lib/win64_vc14/OpenColorIO/build.bat
===================================================================
--- trunk/lib/win64_vc14/OpenColorIO/build.bat (rev 0)
+++ trunk/lib/win64_vc14/OpenColorIO/build.bat 2016-01-12 15:20:18 UTC (rev 61592)
@@ -0,0 +1,40 @@
+ at Echo off
+
+cd OpenColorIO-1.0.9
+
+set LIBDIR=%CD%\..\..
+
+:: create build directory
+
+echo Libdir set to: %LIBDIR%
+
+mkdir build\windows
+cd build\windows
+
+cmake -G "NMake Makefiles" ..\.. ^
+ -DCMAKE_INSTALL_PREFIX=%LIBDIR%\OpenColorIO ^
+ -DCMAKE_CXX_FLAGS_DEBUG="/D_DEBUG /MTd /Zi /Ob0 /Od /RTC1" ^
+ -DCMAKE_CXX_FLAGS_MINSIZEREL="/MT /O1 /Ob1 /D NDEBUG" ^
+ -DCMAKE_CXX_FLAGS_RELEASE="/MT /O2 /Ob2 /D NDEBUG" ^
+ -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="/MT /Zi /O2 /Ob1 /D NDEBUG" ^
+ -DCMAKE_CXX_STANDARD_LIBRARIES:STRING="kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib psapi.lib" ^
+ -DBoost_COMPILER:STRING="-vc120" ^
+ -DBoost_USE_MULTITHREADED=ON ^
+ -DBoost_USE_STATIC_LIBS=ON ^
+ -DBoost_USE_STATIC_RUNTIME=ON ^
+ -DBOOST_ROOT=%LIBDIR%\boost ^
+ -DOCIO_USE_BOOST_PTR=ON ^
+ -DOCIO_BUILD_STATIC=OFF ^
+ -DOCIO_BUILD_SHARED=ON ^
+ -DOCIO_BUILD_APPS=OFF ^
+ -DOCIO_BUILD_PYGLUE=OFF ^
+ -DOCIO_BUILD_NUKE=OFF ^
+ -DCMAKE_BUILD_TYPE=Release
+
+nmake
+nmake install
+
+cd ../../..
+mkdir bin
+copy /Y lib\OpenColorIO.dll bin\
+
Added: trunk/lib/win64_vc14/OpenColorIO/include/OpenColorIO/OpenColorABI.h
===================================================================
--- trunk/lib/win64_vc14/OpenColorIO/include/OpenColorIO/OpenColorABI.h (rev 0)
+++ trunk/lib/win64_vc14/OpenColorIO/include/OpenColorIO/OpenColorABI.h 2016-01-12 15:20:18 UTC (rev 61592)
@@ -0,0 +1,89 @@
+/*
+Copyright (c) 2003-2010 Sony Pictures Imageworks Inc., et al.
+All Rights Reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+* Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+* Neither the name of Sony Pictures Imageworks nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef INCLUDED_OCIO_OPENCOLORABI_H
+#define INCLUDED_OCIO_OPENCOLORABI_H
+
+// Makefile configuration options
+#define OCIO_NAMESPACE OpenColorIO
+#define OCIO_USE_BOOST_PTR 1
+#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
+ Use this for numeric comparisons, e.g. #if OCIO_VERSION_HEX >= ...
+ Note: in the case where SOVERSION is overridden at compile-time,
+ this will reflect the original API version number.
+ */
+#define OCIO_VERSION_HEX ((1 << 24) | \
+ (0 << 16) | \
+ (9 << 8))
+
+
+// Namespace / version mojo
+#define OCIO_NAMESPACE_ENTER namespace OCIO_NAMESPACE { namespace OCIO_VERSION_NS
+#define OCIO_NAMESPACE_EXIT using namespace OCIO_VERSION_NS; }
+#define OCIO_NAMESPACE_USING using namespace OCIO_NAMESPACE;
+
+// shared_ptr / dynamic_pointer_cast
+#if OCIO_USE_BOOST_PTR
+#include <boost/shared_ptr.hpp>
+#define OCIO_SHARED_PTR boost::shared_ptr
+#define OCIO_DYNAMIC_POINTER_CAST boost::dynamic_pointer_cast
+#elif __GNUC__ >= 4
+#include <tr1/memory>
+#define OCIO_SHARED_PTR std::tr1::shared_ptr
+#define OCIO_DYNAMIC_POINTER_CAST std::tr1::dynamic_pointer_cast
+#else
+#error OCIO needs gcc 4 or later to get access to <tr1/memory> (or specify USE_BOOST_PTR instead)
+#endif
+
+// If supported, define OCIOEXPORT, OCIOHIDDEN
+// (used to choose which symbols to export from OpenColorIO)
+#if defined __linux__ || __APPLE__ || __FreeBSD__
+ #if __GNUC__ >= 4
+ #define OCIOEXPORT __attribute__ ((visibility("default")))
+ #define OCIOHIDDEN __attribute__ ((visibility("hidden")))
+ #else
+ #define OCIOEXPORT
+ #define OCIOHIDDEN
+ #endif
+#elif defined(_WIN32) || defined(_WIN64) || defined(_WINDOWS) || defined(_MSC_VER)
+ // Windows requires you to export from the main library and then import in any others
+ #if defined OpenColorIO_EXPORTS
+ #define OCIOEXPORT __declspec(dllexport)
+ #else
+ #define OCIOEXPORT __declspec(dllimport)
+ #endif
+ #define OCIOHIDDEN
+#else // Others platforms not supported atm
+ #define OCIOEXPORT
+ #define OCIOHIDDEN
+#endif
+
+#endif // INCLUDED_OCIO_OPENCOLORABI_H
Added: trunk/lib/win64_vc14/OpenColorIO/include/OpenColorIO/OpenColorIO.h
===================================================================
--- trunk/lib/win64_vc14/OpenColorIO/include/OpenColorIO/OpenColorIO.h (rev 0)
+++ trunk/lib/win64_vc14/OpenColorIO/include/OpenColorIO/OpenColorIO.h 2016-01-12 15:20:18 UTC (rev 61592)
@@ -0,0 +1,1262 @@
+/*
+Copyright (c) 2003-2010 Sony Pictures Imageworks Inc., et al.
+All Rights Reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+* Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+* Neither the name of Sony Pictures Imageworks nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+
+#ifndef INCLUDED_OCIO_OPENCOLORIO_H
+#define INCLUDED_OCIO_OPENCOLORIO_H
+
+#include <exception>
+#include <iosfwd>
+#include <string>
+#include <cstddef>
+
+#include "OpenColorABI.h"
+#include "OpenColorTypes.h"
+#include "OpenColorTransforms.h"
+
+/*!rst::
+C++ API
+=======
+
+**Usage Example:** *Compositing plugin that converts from "log" to "lin"*
+
+.. code-block:: cpp
+
+ #include <OpenColorIO/OpenColorIO.h>
+ namespace OCIO = OCIO_NAMESPACE;
+
+ try
+ {
+ // Get the global OpenColorIO config
+ // This will auto-initialize (using $OCIO) on first use
+ OCIO::ConstConfigRcPtr config = OCIO::GetCurrentConfig();
+
+ // Get the processor corresponding to this transform.
+ OCIO::ConstProcessorRcPtr processor = config->getProcessor(OCIO::ROLE_COMPOSITING_LOG,
+ OCIO::ROLE_SCENE_LINEAR);
+
+ // Wrap the image in a light-weight ImageDescription
+ OCIO::PackedImageDesc img(imageData, w, h, 4);
+
+ // Apply the color transformation (in place)
+ processor->apply(img);
+ }
+ catch(OCIO::Exception & exception)
+ {
+ std::cerr << "OpenColorIO Error: " << exception.what() << std::endl;
+ }
+
+*/
+
+OCIO_NAMESPACE_ENTER
+{
+ ///////////////////////////////////////////////////////////////////////////
+ //!rst::
+ // Exceptions
+ // **********
+
+ //!cpp:class:: An exception class to throw for errors detected at
+ // runtime.
+ //
+ // .. warning::
+ // All functions in the Config class can potentially throw this exception.
+ class OCIOEXPORT Exception : public std::exception
+ {
+ public:
+ //!cpp:function:: Constructor that takes a string as the exception message.
+ Exception(const char *) throw();
+ //!cpp:function:: Constructor that takes an exception pointer.
+ Exception(const Exception&) throw();
+ //!cpp:function:: Constructor that takes an exception pointer and returns an exception pointer (???).
+ Exception& operator=(const Exception&) throw();
+ //!cpp:function::
+ virtual ~Exception() throw();
+ //!cpp:function::
+ virtual const char* what() const throw();
+
+ private:
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list