[Bf-blender-cvs] SVN commit: /data/svn/repos/bf-blender [61595] trunk/lib/win64_vc14/ OpenImageIO: MSVC 2015 windows x64 OpenImage IO 1.6.9
Martijn Berger
martijn.berger at gmail.com
Sat Jan 16 20:23:31 CET 2016
Revision: 61595
https://developer.blender.org/rBL61595
Author: juicyfruit
Date: 2016-01-16 19:23:30 +0000 (Sat, 16 Jan 2016)
Log Message:
-----------
MSVC 2015 windows x64 OpenImage IO 1.6.9
Added Paths:
-----------
trunk/lib/win64_vc14/OpenImageIO/
trunk/lib/win64_vc14/OpenImageIO/build.bat
trunk/lib/win64_vc14/OpenImageIO/include/
trunk/lib/win64_vc14/OpenImageIO/include/OpenImageIO/
trunk/lib/win64_vc14/OpenImageIO/include/OpenImageIO/SHA1.h
trunk/lib/win64_vc14/OpenImageIO/include/OpenImageIO/argparse.h
trunk/lib/win64_vc14/OpenImageIO/include/OpenImageIO/array_view.h
trunk/lib/win64_vc14/OpenImageIO/include/OpenImageIO/color.h
trunk/lib/win64_vc14/OpenImageIO/include/OpenImageIO/coordinate.h
trunk/lib/win64_vc14/OpenImageIO/include/OpenImageIO/dassert.h
trunk/lib/win64_vc14/OpenImageIO/include/OpenImageIO/errorhandler.h
trunk/lib/win64_vc14/OpenImageIO/include/OpenImageIO/export.h
trunk/lib/win64_vc14/OpenImageIO/include/OpenImageIO/filesystem.h
trunk/lib/win64_vc14/OpenImageIO/include/OpenImageIO/filter.h
trunk/lib/win64_vc14/OpenImageIO/include/OpenImageIO/fmath.h
trunk/lib/win64_vc14/OpenImageIO/include/OpenImageIO/hash.h
trunk/lib/win64_vc14/OpenImageIO/include/OpenImageIO/image_view.h
trunk/lib/win64_vc14/OpenImageIO/include/OpenImageIO/imagebuf.h
trunk/lib/win64_vc14/OpenImageIO/include/OpenImageIO/imagebufalgo.h
trunk/lib/win64_vc14/OpenImageIO/include/OpenImageIO/imagebufalgo_util.h
trunk/lib/win64_vc14/OpenImageIO/include/OpenImageIO/imagecache.h
trunk/lib/win64_vc14/OpenImageIO/include/OpenImageIO/imageio.h
trunk/lib/win64_vc14/OpenImageIO/include/OpenImageIO/missing_math.h
trunk/lib/win64_vc14/OpenImageIO/include/OpenImageIO/oiioversion.h
trunk/lib/win64_vc14/OpenImageIO/include/OpenImageIO/optparser.h
trunk/lib/win64_vc14/OpenImageIO/include/OpenImageIO/osdep.h
trunk/lib/win64_vc14/OpenImageIO/include/OpenImageIO/paramlist.h
trunk/lib/win64_vc14/OpenImageIO/include/OpenImageIO/platform.h
trunk/lib/win64_vc14/OpenImageIO/include/OpenImageIO/plugin.h
trunk/lib/win64_vc14/OpenImageIO/include/OpenImageIO/pugiconfig.hpp
trunk/lib/win64_vc14/OpenImageIO/include/OpenImageIO/pugixml.cpp
trunk/lib/win64_vc14/OpenImageIO/include/OpenImageIO/pugixml.hpp
trunk/lib/win64_vc14/OpenImageIO/include/OpenImageIO/refcnt.h
trunk/lib/win64_vc14/OpenImageIO/include/OpenImageIO/simd.h
trunk/lib/win64_vc14/OpenImageIO/include/OpenImageIO/strided_ptr.h
trunk/lib/win64_vc14/OpenImageIO/include/OpenImageIO/string_view.h
trunk/lib/win64_vc14/OpenImageIO/include/OpenImageIO/strutil.h
trunk/lib/win64_vc14/OpenImageIO/include/OpenImageIO/sysutil.h
trunk/lib/win64_vc14/OpenImageIO/include/OpenImageIO/texture.h
trunk/lib/win64_vc14/OpenImageIO/include/OpenImageIO/thread.h
trunk/lib/win64_vc14/OpenImageIO/include/OpenImageIO/timer.h
trunk/lib/win64_vc14/OpenImageIO/include/OpenImageIO/tinyformat.h
trunk/lib/win64_vc14/OpenImageIO/include/OpenImageIO/typedesc.h
trunk/lib/win64_vc14/OpenImageIO/include/OpenImageIO/unittest.h
trunk/lib/win64_vc14/OpenImageIO/include/OpenImageIO/unordered_map_concurrent.h
trunk/lib/win64_vc14/OpenImageIO/include/OpenImageIO/ustring.h
trunk/lib/win64_vc14/OpenImageIO/include/OpenImageIO/varyingref.h
trunk/lib/win64_vc14/OpenImageIO/include/OpenImageIO/version.h
trunk/lib/win64_vc14/OpenImageIO/lib/
trunk/lib/win64_vc14/OpenImageIO/lib/OpenImageIO.lib
trunk/lib/win64_vc14/OpenImageIO/lib/OpenImageIO_Util.lib
Added: trunk/lib/win64_vc14/OpenImageIO/build.bat
===================================================================
--- trunk/lib/win64_vc14/OpenImageIO/build.bat (rev 0)
+++ trunk/lib/win64_vc14/OpenImageIO/build.bat 2016-01-16 19:23:30 UTC (rev 61595)
@@ -0,0 +1,205 @@
+ at Echo off
+setlocal
+
+set LIBDIR=%CD%\..
+set LIBNAME=OpenImageIO
+set OIIO_VERSION=1.6.9
+set "OIIO_SOURCE=https://github.com/OpenImageIO/oiio/archive/Release-%OIIO_VERSION%.zip"
+
+:: create build directory
+echo Libdir set to: %LIBDIR%
+
+set BUILD_TYPE=Release
+
+call :CheckOS
+
+call :CheckPath
+
+call :CheckBuildSystem
+
+call :CheckTargetArch
+
+if not exist oiio-Release-%OIIO_VERSION% (
+ echo getting source
+ call :PrepareSource
+)
+
+IF [%1]==[DEBUG] (
+call :Build_debug
+) ELSE (
+call :Build
+)
+
+exit /b
+
+:Build
+cd %LIBDIR%\openimageio\oiio-Release-%OIIO_VERSION%
+mkdir build\windows
+cd build\windows
+
+cmake -G "Visual Studio 14 2015 Win64" ..\.. ^
+ -DCMAKE_INSTALL_PREFIX=%LIBDIR%\openimageio ^
+ -DCMAKE_CXX_FLAGS_DEBUG="/D_DEBUG /MTd /Zi /Ob0 /Od /DPSAPI_VERSION=1 /RTC1" ^
+ -DCMAKE_CXX_FLAGS_MINSIZEREL="/MT /O1 /Ob1 /DPSAPI_VERSION=1 /D NDEBUG" ^
+ -DCMAKE_CXX_FLAGS_RELEASE="/MT /O2 /Ob2 /DPSAPI_VERSION=1 /D NDEBUG" ^
+ -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="/MT /Zi /O2 /Ob1 /DPSAPI_VERSION=1 /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" ^
+ -DBUILDSTATIC=ON ^
+ -DLINKSTATIC=ON ^
+ -OIIO_BUILD_CPP11=ON ^
+ -DBoost_COMPILER:STRING="-vc140" ^
+ -DBoost_USE_MULTITHREADED=ON ^
+ -DBoost_USE_STATIC_LIBS=ON ^
+ -DBoost_USE_STATIC_RUNTIME=ON ^
+ -DBOOST_ROOT=%LIBDIR%\boost ^
+ -DILMBASE_INCLUDE_DIR=%LIBDIR%\openexr\include ^
+ -DILMBASE_HALF_LIBRARIES=%LIBDIR%\openexr\lib\Half.lib ^
+ -DILMBASE_IMATH_LIBRARIES=%LIBDIR%\openexr\lib\Imath-2_2.lib ^
+ -DILMBASE_ILMTHREAD_LIBRARIES=%LIBDIR%\openexr\lib\IlmThread-2_2.lib ^
+ -DILMBASE_IEX_LIBRARIES=%LIBDIR%\openexr\lib\Iex-2_2.lib ^
+ -DOPENEXR_INCLUDE_DIR=%LIBDIR%\openexr\include ^
+ -DOPENEXR_ILMIMF_LIBRARIES=%LIBDIR%\openexr\lib\IlmImf-2_2.lib ^
+ -DZLIB_LIBRARY=%LIBDIR%\zlib\lib\libz_st.lib ^
+ -DZLIB_INCLUDE_DIR=%LIBDIR%\zlib\include ^
+ -DPNG_LIBRARY=%LIBDIR%\png\lib\libpng.lib ^
+ -DPNG_PNG_INCLUDE_DIR=%LIBDIR%\png\include ^
+ -DOIIO_LIBRARY=%LIBDIR%\oiio\lib\liboiio.lib ^
+ -DOIIO_INCLUDE_DIR=%LIBDIR%\oiio\include ^
+ -DTIFF_LIBRARY=%LIBDIR%\tiff\lib\libtiff.lib ^
+ -DTIFF_INCLUDE_DIR=%LIBDIR%\tiff\include ^
+ -DJPEG_LIBRARY=%LIBDIR%\jpeg\lib\libjpeg.lib ^
+ -DJPEG_INCLUDE_DIR=%LIBDIR%\jpeg\include ^
+ -DOCIO_PATH=%LIBDIR%\opencolorio ^
+ -DUSE_OPENGL=OFF ^
+ -DUSE_TBB=OFF ^
+ -DUSE_FIELD3D=OFF ^
+ -DUSE_QT=OFF ^
+ -DUSE_PYTHON=OFF ^
+ -DOIIO_BUILD_TOOLS=ON ^
+ -DOIIO_BUILD_TESTS=ON ^
+ -DBUILD_TESTING=ON ^
+ -DCMAKE_BUILD_TYPE=Release
+
+
+msbuild /p:Configuration=Release /t:Build /p:Platform="x64" openimageio.sln
+msbuild /p:Configuration=Release /t:Build /p:Platform="x64" INSTALL.vcxproj
+
+goto:eof
+
+cd %RET_DIR%
+exit /b
+
+cd ../..
+
+
+:Build_debug
+cd %LIBDIR%\openimageio\oiio-Release-%OIIO_VERSION%
+mkdir build\windows-dbg
+cd build\windows-dbg
+
+cmake -G "Visual Studio 14 2015 Win64" ..\.. ^
+ -DCMAKE_INSTALL_PREFIX=%LIBDIR%\openimageio\debug ^
+ -DCMAKE_CXX_FLAGS_DEBUG="/D_DEBUG /MTd /Zi /Ob0 /Od /DPSAPI_VERSION=1 /RTC1" ^
+ -DCMAKE_CXX_FLAGS_MINSIZEREL="/MT /O1 /Ob1 /DPSAPI_VERSION=1 /D NDEBUG" ^
+ -DCMAKE_CXX_FLAGS_RELEASE="/MT /O2 /Ob2 /DPSAPI_VERSION=1 /D NDEBUG" ^
+ -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="/MT /Zi /O2 /Ob1 /DPSAPI_VERSION=1 /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" ^
+ -DBUILDSTATIC=ON ^
+ -DLINKSTATIC=ON ^
+ -OIIO_BUILD_CPP11=ON ^
+ -DBoost_COMPILER:STRING="-vc140" ^
+ -DBoost_USE_MULTITHREADED=ON ^
+ -DBoost_USE_STATIC_LIBS=ON ^
+ -DBoost_USE_STATIC_RUNTIME=ON ^
+ -DBOOST_ROOT=%LIBDIR%\boost ^
+ -DOPENEXR_INCLUDE_DIR=%LIBDIR%\openexr\include ^
+ -DILMBASE_INCLUDE_DIR=%LIBDIR%\openexr\include ^
+ -DILMBASE_HALF_LIBRARIES=%LIBDIR%\openexr\lib\Half_d.lib ^
+ -DILMBASE_IMATH_LIBRARIES=%LIBDIR%\openexr\lib\Imath-2_2_d.lib ^
+ -DILMBASE_ILMTHREAD_LIBRARIES=%LIBDIR%\openexr\lib\IlmThread-2_2_d.lib ^
+ -DILMBASE_IEX_LIBRARIES=%LIBDIR%\openexr\lib\Iex-2_2_d.lib ^
+ -DOPENEXR_ILMIMF_LIBRARIES=%LIBDIR%\openexr\lib\IlmImf-2_2_d.lib ^
+ -DZLIB_LIBRARY=%LIBDIR%\zlib\lib\libz_st_d.lib ^
+ -DZLIB_INCLUDE_DIR=%LIBDIR%\zlib\include ^
+ -DPNG_LIBRARY=%LIBDIR%\png\lib\libpng16.lib ^
+ -DPNG_PNG_INCLUDE_DIR=%LIBDIR%\png\include ^
+ -DOIIO_LIBRARY=%LIBDIR%\oiio\lib\liboiio.lib ^
+ -DOIIO_INCLUDE_DIR=%LIBDIR%\oiio\include ^
+ -DTIFF_LIBRARY=%LIBDIR%\tiff\lib\libtiff.lib ^
+ -DTIFF_INCLUDE_DIR=%LIBDIR%\tiff\include ^
+ -DJPEG_LIBRARY=%LIBDIR%\jpeg\lib\libjpeg.lib ^
+ -DJPEG_INCLUDE_DIR=%LIBDIR%\jpeg\include ^
+ -DOCIO_PATH=%LIBDIR%\opencolorio ^
+ -DUSE_OPENGL=OFF ^
+ -DUSE_TBB=OFF ^
+ -DUSE_FIELD3D=OFF ^
+ -DUSE_QT=OFF ^
+ -DUSE_PYTHON=OFF ^
+ -DOIIO_BUILD_TOOLS=OFF ^
+ -DOIIO_BUILD_TESTS=OFF ^
+ -DBUILD_TESTING=OFF ^
+ -DCMAKE_DEBUG_POSTFIX:STRING="_d" ^
+ -DCMAKE_BUILD_TYPE=Debug
+
+msbuild /p:Configuration=Debug /t:Rebuild /p:Platform="x64" openimageio.sln
+msbuild /p:Configuration=Debug /t:Build /p:Platform="x64" INSTALL.vcxproj
+
+goto:eof
+
+
+:CheckTargetArch
+cl 2>&1 | findstr /c:x64 >nul 2>&1
+if errorlevel 1 (
+ set targetarch=Win32
+ echo target win32
+) else (
+ set targetarch=x64
+ echo target x64
+)
+
+goto:eof
+
+
+:PrepareSource
+
+if not exist oiio-Release-%OIIO_VERSION%.zip (
+ echo Downloading %LIBNAME% %OIIO_VERSION%
+ curl -L "%OIIO_SOURCE%" -o oiio-Release-%OIIO_VERSION%.zip
+)
+
+if not exist oiio-Release-%OIIO_VERSION% (
+ echo Extraction source %LIBNAME% %OIIO_VERSION%
+ unzip oiio-Release-%OIIO_VERSION%.zip
+)
+
+goto:eof
+
+:CheckOS
+IF EXIST "%PROGRAMFILES(X86)%" (set bit=x64) ELSE (set bit=x86)
+goto:eof
+
+:CheckPath
+echo Checking for git in the path
+diff >nul 2>&1
+if errorlevel 9009 (
+ echo diff is not in the current path, it needs to be
+ if %bit%==x64 ( set "PATH=%PATH%;%PROGRAMFILES(X86)%\Git\bin"
+ ) else ( set "PATH=%PATH%;%PROGRAMFILES%\Git\bin" )
+
+ diff >nul 2>&1
+ if errorlevel 9009 (
+ echo please install msys git
+ exit /b
+ )
+)
+echo We got git/diff/patch etc
+goto:eof
+
+:CheckBuildSystem
+msbuild >nul 2>&1
+if errorlevel 9009 (
+ echo "we need msbuild"
+ exit /b
+)
+goto:eof
+
Added: trunk/lib/win64_vc14/OpenImageIO/include/OpenImageIO/SHA1.h
===================================================================
--- trunk/lib/win64_vc14/OpenImageIO/include/OpenImageIO/SHA1.h (rev 0)
+++ trunk/lib/win64_vc14/OpenImageIO/include/OpenImageIO/SHA1.h 2016-01-16 19:23:30 UTC (rev 61595)
@@ -0,0 +1,261 @@
+/*
+ 100% free public domain implementation of the SHA-1 algorithm
+ by Dominik Reichl <dominik.reichl at t-online.de>
+ Web: http://www.dominik-reichl.de/
+
+ Version 1.8 - 2008-03-16
+ - Converted project files to Visual Studio 2008 format.
+ - Added Unicode support for HashFile utility method.
+ - Added support for hashing files using the HashFile method that are
+ larger than 2 GB.
+ - HashFile now returns an error code instead of copying an error
+ message into the output buffer.
+ - GetHash now returns an error code and validates the input parameter.
+ - Added ReportHashStl STL utility method.
+ - Added REPORT_HEX_SHORT reporting mode.
+ - Improved Linux compatibility of test program.
+
+ Version 1.7 - 2006-12-21
+ - Fixed buffer underrun warning that appeared when compiling with
+ Borland C Builder (thanks to Rex Bloom and Tim Gallagher for the
+ patch).
+ - Breaking change: ReportHash writes the final hash to the start
+ of the buffer, i.e. it's not appending it to the string anymore.
+ - Made some function parameters const.
+ - Added Visual Studio 2005 project files to demo project.
+
+ Version 1.6 - 2005-02-07 (thanks to Howard Kapustein for patches)
+ - You can set the endianness in your files, no need to modify the
+ header file of the CSHA1 class anymore.
+ - Aligned data support.
+ - Made support/compilation of the utility functions (ReportHash and
+ HashFile) optional (useful when bytes count, for example in embedded
+ environments).
+
+ Version 1.5 - 2005-01-01
+ - 64-bit compiler compatibility added.
+ - Made variable wiping optional (define SHA1_WIPE_VARIABLES).
+ - Removed unnecessary variable initializations.
+ - ROL32 improvement for the Microsoft compiler (using _rotl).
+
+ Version 1.4 - 2004-07-22
+ - CSHA1 now compiles fine with GCC 3.3 under MacOS X (thanks to Larry
+ Hastings).
+
+ Version 1.3 - 2003-08-17
+ - Fixed a small memory bug and made a buffer array a class member to
+ ensure correct working when using multiple CSHA1 class instances at
+ one time.
+
+ Version 1.2 - 2002-11-16
+ - Borlands C++ compiler seems to have problems with string addition
+ using sprintf. Fixed the bug which caused the digest report function
+ not to work properly. CSHA1 is now Borland compatible.
+
+ Version 1.1 - 2002-10-11
+ - Removed two unnecessary header file includes and changed BOOL to
+ bool. Fixed some minor bugs in the web page contents.
+
+ Version 1.0 - 2002-06-20
+ - First official release.
+
+ ======== Test Vectors (from FIPS PUB 180-1) ========
+
+ SHA1("abc") =
+ A9993E36 4706816A BA3E2571 7850C26C 9CD0D89D
+
+ SHA1("abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq") =
+ 84983E44 1C3BD26E BAAE4AA1 F95129E5 E54670F1
+
+ SHA1(A million repetitions of "a") =
+ 34AA973C D4C4DAA4 F61EEB2B DBAD2731 6534016F
+*/
+
+#ifndef ___SHA1_HDR___
+#define ___SHA1_HDR___
+
+#include "export.h"
+#include "oiioversion.h"
+
+#if !defined(SHA1_UTILITY_FUNCTIONS) && !defined(SHA1_NO_UTILITY_FUNCTIONS)
+#define SHA1_UTILITY_FUNCTIONS
+#endif
+
+#if !defined(SHA1_STL_FUNCTIONS) && !defined(SHA1_NO_STL_FUNCTIONS)
+#define SHA1_STL_FUNCTIONS
+#if !defined(SHA1_UTILITY_FUNCTIONS)
+#error STL functions require SHA1_UTILITY_FUNCTIONS.
+#endif
+#endif
+
+#include <memory.h>
+
+#ifdef SHA1_UTILITY_FUNCTIONS
+#include <stdio.h>
+#include <string.h>
+#endif
+
+#ifdef SHA1_STL_FUNCTIONS
+#include <string>
+#endif
+
+#ifdef _MSC_VER
+#include <stdlib.h>
+#endif
+
+// You can define the endian mode in your files without modifying the SHA-1
+// source files. Just #define SHA1_LITTLE_ENDIAN or #define SHA1_BIG_ENDIAN
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list