[Bf-blender-cvs] SVN commit: /data/svn/repos/bf-blender [61488] trunk/lib/windows_vc12/ openimageio: Bump OpenimageIO to 1.4.16 for win32 MSVC 2013
Martijn Berger
martijn.berger at gmail.com
Mon Feb 2 21:29:49 CET 2015
Revision: 61488
https://developer.blender.org/rBL61488
Author: juicyfruit
Date: 2015-02-02 20:29:46 +0000 (Mon, 02 Feb 2015)
Log Message:
-----------
Bump OpenimageIO to 1.4.16 for win32 MSVC 2013
Modified Paths:
--------------
trunk/lib/windows_vc12/openimageio/build.bat
trunk/lib/windows_vc12/openimageio/include/OpenImageIO/fmath.h
trunk/lib/windows_vc12/openimageio/include/OpenImageIO/imagebufalgo.h
trunk/lib/windows_vc12/openimageio/include/OpenImageIO/imageio.h
trunk/lib/windows_vc12/openimageio/include/OpenImageIO/oiioversion.h
trunk/lib/windows_vc12/openimageio/include/OpenImageIO/strutil.h
trunk/lib/windows_vc12/openimageio/include/OpenImageIO/sysutil.h
trunk/lib/windows_vc12/openimageio/include/OpenImageIO/ustring.h
trunk/lib/windows_vc12/openimageio/lib/OpenImageIO.lib
trunk/lib/windows_vc12/openimageio/lib/OpenImageIO_Util.lib
trunk/lib/windows_vc12/openimageio/lib/OpenImageIO_Util_d.lib
trunk/lib/windows_vc12/openimageio/lib/OpenImageIO_d.lib
Added Paths:
-----------
trunk/lib/windows_vc12/openimageio/include/OpenImageIO/platform.h
Modified: trunk/lib/windows_vc12/openimageio/build.bat
===================================================================
--- trunk/lib/windows_vc12/openimageio/build.bat 2015-02-02 20:01:01 UTC (rev 61487)
+++ trunk/lib/windows_vc12/openimageio/build.bat 2015-02-02 20:29:46 UTC (rev 61488)
@@ -1,9 +1,9 @@
-::@Echo off
+ at Echo off
setlocal
set LIBDIR=%CD%\..
set LIBNAME=OpenImageIO
-set OIIO_VERSION=1.3.12
+set OIIO_VERSION=1.4.16
set "OIIO_SOURCE=https://github.com/OpenImageIO/oiio/archive/Release-%OIIO_VERSION%.zip"
:: create build directory
@@ -33,16 +33,16 @@
exit /b
:Build
-cd oiio-Release-%OIIO_VERSION%
+cd %LIBDIR%\openimageio\oiio-Release-%OIIO_VERSION%
mkdir build\windows
cd build\windows
cmake -G "NMake Makefiles" ..\.. ^
-DCMAKE_INSTALL_PREFIX=%LIBDIR%\openimageio ^
- -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_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 ^
@@ -53,14 +53,14 @@
-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_1.lib ^
- -DILMBASE_ILMTHREAD_LIBRARIES=%LIBDIR%\openexr\lib\IlmThread-2_1.lib ^
- -DILMBASE_IEX_LIBRARIES=%LIBDIR%\openexr\lib\Iex-2_1.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_1.lib ^
+ -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\libpng16.lib ^
+ -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 ^
@@ -75,27 +75,32 @@
-DUSE_QT=OFF ^
-DUSE_PYTHON=OFF ^
-DOIIO_BUILD_TOOLS=OFF ^
- -DOIIO_BUILD_TESTS=OFF ^
+ -DOIIO_BUILD_TESTS=ON ^
+ -DBUILD_TESTING=ON ^
-DCMAKE_BUILD_TYPE=Release
-nmake
+
nmake install
goto:eof
+cd %RET_DIR%
+exit /b
+cd ../..
+
+
:Build_debug
-cd oiio-Release-%OIIO_VERSION%
-
+cd %LIBDIR%\openimageio\oiio-Release-%OIIO_VERSION%
mkdir build\windows-dbg
cd build\windows-dbg
cmake -G "NMake Makefiles" ..\.. ^
- -DCMAKE_INSTALL_PREFIX=%LIBDIR%\openimageio ^
- -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_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 ^
@@ -104,13 +109,13 @@
-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_1._dlib ^
- -DILMBASE_ILMTHREAD_LIBRARIES=%LIBDIR%\openexr\lib\IlmThread-2_1_d.lib ^
- -DILMBASE_IEX_LIBRARIES=%LIBDIR%\openexr\lib\Iex-2_1_d.lib ^
- -DOPENEXR_INCLUDE_DIR=%LIBDIR%\openexr\include ^
- -DOPENEXR_ILMIMF_LIBRARIES=%LIBDIR%\openexr\lib\IlmImf-2_1_d.lib ^
+ -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_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\libpng16.lib ^
@@ -121,6 +126,7 @@
-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 ^
@@ -128,12 +134,11 @@
-DUSE_PYTHON=OFF ^
-DOIIO_BUILD_TOOLS=OFF ^
-DOIIO_BUILD_TESTS=OFF ^
+ -DBUILD_TESTING=OFF ^
-DCMAKE_DEBUG_POSTFIX:STRING="_d" ^
-DCMAKE_BUILD_TYPE=Debug
-nmake
nmake install
-
goto:eof
@@ -162,13 +167,6 @@
unzip oiio-Release-%OIIO_VERSION%.zip
)
-if not exist oiio-Release-%OIIO_VERSION%\.patch_done (
- patch -p1 -i msvc_2013.patch
- echo 1 > oiio-Release-%OIIO_VERSION%\.patch_done
-)
-
-
-
goto:eof
:CheckOS
Modified: trunk/lib/windows_vc12/openimageio/include/OpenImageIO/fmath.h
===================================================================
--- trunk/lib/windows_vc12/openimageio/include/OpenImageIO/fmath.h 2015-02-02 20:01:01 UTC (rev 61487)
+++ trunk/lib/windows_vc12/openimageio/include/OpenImageIO/fmath.h 2015-02-02 20:29:46 UTC (rev 61488)
@@ -938,7 +938,6 @@
{
return (float)(int)val;
}
-using OIIO::truncf;
#if defined(_MSC_VER) && _MSC_VER < 1800 /* Needed for MSVS prior to 2013 */
@@ -947,31 +946,31 @@
inline int isnan (T x) {
return _isnan(x);
}
-using OIIO::isnan;
+
template<class T>
inline int isfinite (T x) {
return _finite(x);
}
-using OIIO::isfinite;
+
template<class T>
inline int isinf (T x) {
return (isfinite(x)||isnan(x)) ? 0 : static_cast<int>(copysign(T(1.0), x));
}
-using OIIO::isinf;
+
inline double
round (float val) {
return floor (val + 0.5);
}
-using OIIO::round;
+
inline float
roundf (float val) {
return static_cast<float>(round (val));
}
-using OIIO::roundf;
+
#endif /* MSVS < 2013 */
@@ -979,7 +978,6 @@
log2f (float val) {
return logf (val)/static_cast<float>(M_LN2);
}
-using OIIO::log2f;
inline float
@@ -987,7 +985,6 @@
// 2^val = e^(val*ln(2))
return exp( val*log(2.0f) );
}
-using OIIO::exp2f;
#if defined(_MSC_VER) && _MSC_VER < 1800 /* Needed for MSVS prior to 2013 */
@@ -996,8 +993,8 @@
// please see http://www.kernel.org/doc/man-pages/online/pages/man3/logb.3.html
return logf(val)/logf(FLT_RADIX);
}
-using OIIO::logbf;
+
// from http://www.johndcook.com/cpp_expm1.html
inline double
expm1(double val)
@@ -1008,15 +1005,15 @@
else
return exp(val) - 1.0;
}
-using OIIO::expm1;
+
inline float
expm1f(float val)
{
return (float)expm1(val);
}
-using OIIO::expm1f;
+
// from http://www.johndcook.com/cpp_erf.html
inline double
erf(double x)
@@ -1041,36 +1038,36 @@
return sign*y;
}
-using OIIO::erf;
+
inline float
erff(float val)
{
return (float)erf(val);
}
-using OIIO::erff;
+
inline double
erfc(double val)
{
return 1.0 - erf(val);
}
-using OIIO::erfc;
+
inline float
erfcf(float val)
{
return (float)erfc(val);
}
-using OIIO::erfcf;
+
#endif /* MSVS < 2013 */
-
#endif /* _WIN32 */
-// Some systems have isnan, isinf and isfinite in the std namespace.
#ifndef _MSC_VER
+ // Some systems have isnan, isinf and isfinite in the std namespace.
+ // FIXME: remove these later
using std::isnan;
using std::isinf;
using std::isfinite;
@@ -1086,7 +1083,6 @@
return logf (val)/static_cast<float>(M_LN2);
}
-using OIIO::log2f;
#endif
@@ -1277,4 +1273,39 @@
}
OIIO_NAMESPACE_EXIT
+
+// For certain platforms, direct them to use OIIO's implementations.
+
+#ifdef _WIN32
+ using OIIO::truncf;
+ using OIIO::log2f;
+ using OIIO::exp2f;
+# if defined(_MSC_VER) && _MSC_VER < 1800 /* Needed for MSVS prior to 2013 */
+ using OIIO::isnan;
+ using OIIO::isfinite;
+ using OIIO::isinf;
+ using OIIO::round;
+ using OIIO::roundf;
+ using OIIO::logbf;
+ using OIIO::expm1;
+ using OIIO::expm1f;
+ using OIIO::erf;
+ using OIIO::erff;
+ using OIIO::erfc;
+ using OIIO::erfcf;
+# endif /* MSVS < 2013 */
+#endif /* _WIN32 */
+
+#ifndef _MSC_VER
+ // Some systems have isnan, isinf and isfinite in the std namespace.
+ using std::isnan;
+ using std::isinf;
+ using std::isfinite;
+#endif
+
+#if (defined(__FreeBSD__) && (__FreeBSD_version < 803000))
+ using OIIO::log2f;
+#endif
+
+
#endif // OPENIMAGEIO_FMATH_H
Modified: trunk/lib/windows_vc12/openimageio/include/OpenImageIO/imagebufalgo.h
===================================================================
--- trunk/lib/windows_vc12/openimageio/include/OpenImageIO/imagebufalgo.h 2015-02-02 20:01:01 UTC (rev 61487)
+++ trunk/lib/windows_vc12/openimageio/include/OpenImageIO/imagebufalgo.h 2015-02-02 20:29:46 UTC (rev 61488)
@@ -1573,7 +1573,7 @@
/// If nonzero, change RGB images which have
/// R==G==B everywhere to single-channel
/// grayscale (default: 0).
-/// maketx:opaquedetect (int)
+/// maketx:opaque_detect (int)
/// If nonzero, drop the alpha channel if alpha
/// is 1.0 in all pixels (default: 0).
/// maketx:unpremult (int) If nonzero, unpremultiply color by alpha before
Modified: trunk/lib/windows_vc12/openimageio/include/OpenImageIO/imageio.h
===================================================================
--- trunk/lib/windows_vc12/openimageio/include/OpenImageIO/imageio.h 2015-02-02 20:01:01 UTC (rev 61487)
+++ trunk/lib/windows_vc12/openimageio/include/OpenImageIO/imageio.h 2015-02-02 20:29:46 UTC (rev 61488)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list