[Bf-blender-cvs] SVN commit: /data/svn/repos/bf-blender [61485] trunk/lib/win64_vc12/ OpenImageIO: MSVC 2013 Win64 Bump OpenImageIO to 1.4.16

Martijn Berger martijn.berger at gmail.com
Mon Feb 2 19:46:54 CET 2015 

Revision: 61485
          https://developer.blender.org/rBL61485
Author:   juicyfruit
Date:     2015-02-02 18:46:48 +0000 (Mon, 02 Feb 2015)
Log Message:
-----------
MSVC 2013 Win64 Bump OpenImageIO to 1.4.16

Modified Paths:
--------------
    trunk/lib/win64_vc12/OpenImageIO/bin/idiff.exe
    trunk/lib/win64_vc12/OpenImageIO/build.bat
    trunk/lib/win64_vc12/OpenImageIO/include/OpenImageIO/fmath.h
    trunk/lib/win64_vc12/OpenImageIO/include/OpenImageIO/imagebufalgo.h
    trunk/lib/win64_vc12/OpenImageIO/include/OpenImageIO/imageio.h
    trunk/lib/win64_vc12/OpenImageIO/include/OpenImageIO/oiioversion.h
    trunk/lib/win64_vc12/OpenImageIO/include/OpenImageIO/strutil.h
    trunk/lib/win64_vc12/OpenImageIO/include/OpenImageIO/sysutil.h
    trunk/lib/win64_vc12/OpenImageIO/include/OpenImageIO/ustring.h
    trunk/lib/win64_vc12/OpenImageIO/lib/OpenImageIO.lib
    trunk/lib/win64_vc12/OpenImageIO/lib/OpenImageIO_Util.lib
    trunk/lib/win64_vc12/OpenImageIO/lib/OpenImageIO_Util_d.lib
    trunk/lib/win64_vc12/OpenImageIO/lib/OpenImageIO_d.lib

Removed Paths:
-------------
    trunk/lib/win64_vc12/OpenImageIO/msvc.patch
    trunk/lib/win64_vc12/OpenImageIO/msvc_2013.patch

Modified: trunk/lib/win64_vc12/OpenImageIO/bin/idiff.exe
===================================================================
(Binary files differ)

Modified: trunk/lib/win64_vc12/OpenImageIO/build.bat
===================================================================
--- trunk/lib/win64_vc12/OpenImageIO/build.bat	2015-02-02 18:40:18 UTC (rev 61484)
+++ trunk/lib/win64_vc12/OpenImageIO/build.bat	2015-02-02 18:46:48 UTC (rev 61485)
@@ -3,7 +3,7 @@
 
 set LIBDIR=%CD%\..
 set LIBNAME=OpenImageIO
-set OIIO_VERSION=1.4.12
+set OIIO_VERSION=1.4.16
 set "OIIO_SOURCE=https://github.com/OpenImageIO/oiio/archive/Release-%OIIO_VERSION%.zip"
 
 :: create build directory
@@ -53,11 +53,11 @@
  -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\libpng.lib ^
@@ -74,7 +74,7 @@
  -DUSE_FIELD3D=OFF ^
  -DUSE_QT=OFF ^
  -DUSE_PYTHON=OFF ^
- -DOIIO_BUILD_TOOLS=OFF ^
+ -DOIIO_BUILD_TOOLS=ON ^
  -DOIIO_BUILD_TESTS=ON ^
  -DBUILD_TESTING=ON ^
  -DCMAKE_BUILD_TYPE=Release
@@ -97,7 +97,7 @@
 cd build\windows-dbg
 
 cmake -G "Visual Studio 12 2013 Win64" ..\.. ^
- -DCMAKE_INSTALL_PREFIX=%LIBDIR%\openimageio ^
+ -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" ^
@@ -112,12 +112,12 @@
  -DBOOST_ROOT=%LIBDIR%\boost ^
  -DOPENEXR_INCLUDE_DIR=%LIBDIR%\openexr\include ^
  -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 ^
- -DOPENEXR_ILMIMF_LIBRARIES=%LIBDIR%\openexr\lib\IlmImf-2_1.lib ^
- -DZLIB_LIBRARY=%LIBDIR%\zlib\lib\libz_st.lib ^
+ -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 ^

Modified: trunk/lib/win64_vc12/OpenImageIO/include/OpenImageIO/fmath.h
===================================================================
--- trunk/lib/win64_vc12/OpenImageIO/include/OpenImageIO/fmath.h	2015-02-02 18:40:18 UTC (rev 61484)
+++ trunk/lib/win64_vc12/OpenImageIO/include/OpenImageIO/fmath.h	2015-02-02 18:46:48 UTC (rev 61485)
@@ -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/win64_vc12/OpenImageIO/include/OpenImageIO/imagebufalgo.h
===================================================================
--- trunk/lib/win64_vc12/OpenImageIO/include/OpenImageIO/imagebufalgo.h	2015-02-02 18:40:18 UTC (rev 61484)
+++ trunk/lib/win64_vc12/OpenImageIO/include/OpenImageIO/imagebufalgo.h	2015-02-02 18:46:48 UTC (rev 61485)
@@ -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/win64_vc12/OpenImageIO/include/OpenImageIO/imageio.h
===================================================================
--- trunk/lib/win64_vc12/OpenImageIO/include/OpenImageIO/imageio.h	2015-02-02 18:40:18 UTC (rev 61484)
+++ trunk/lib/win64_vc12/OpenImageIO/include/OpenImageIO/imageio.h	2015-02-02 18:46:48 UTC (rev 61485)
@@ -1201,7 +1201,7 @@
 /// Helper function: convert contiguous arbitrary data between two
 /// arbitrary types (specified by TypeDesc's)
 /// Return true if ok, false if it didn't know how to do the
-/// conversion.  If dst_type is UNKNWON, it will be assumed to be the
+/// conversion.  If dst_type is UNKNOWN, it will be assumed to be the
 /// same as src_type.
 OIIO_API bool convert_types (TypeDesc src_type, const void *src,
                               TypeDesc dst_type, void *dst, int n);

Modified: trunk/lib/win64_vc12/OpenImageIO/include/OpenImageIO/oiioversion.h
===================================================================
--- trunk/lib/win64_vc12/OpenImageIO/include/OpenImageIO/oiioversion.h	2015-02-02 18:40:18 UTC (rev 61484)
+++ trunk/lib/win64_vc12/OpenImageIO/include/OpenImageIO/oiioversion.h	2015-02-02 18:46:48 UTC (rev 61485)
@@ -38,7 +38,7 @@
 #define OIIO_NAMESPACE OpenImageIO
 #define OIIO_VERSION_MAJOR 1
 #define OIIO_VERSION_MINOR 4
-#define OIIO_VERSION_PATCH 12
+#define OIIO_VERSION_PATCH 16
 #define OIIO_VERSION_RELEASE_TYPE 
 #define OIIO_VERSION_NS v1_4
 

Modified: trunk/lib/win64_vc12/OpenImageIO/include/OpenImageIO/strutil.h
===================================================================
--- trunk/lib/win64_vc12/OpenImageIO/include/OpenImageIO/strutil.h	2015-02-02 18:40:18 UTC (rev 61484)
+++ trunk/lib/win64_vc12/OpenImageIO/include/OpenImageIO/strutil.h	2015-02-02 18:46:48 UTC (rev 61485)
@@ -49,7 +49,6 @@
 
 #include "export.h"
 #include "oiioversion.h"
-#define TINYFORMAT_ALLOW_WCHAR_STRINGS
 #include "tinyformat.h"
 #include "string_view.h"
 

Modified: trunk/lib/win64_vc12/OpenImageIO/include/OpenImageIO/sysutil.h
===================================================================
--- trunk/lib/win64_vc12/OpenImageIO/include/OpenImageIO/sysutil.h	2015-02-02 18:40:18 UTC (rev 61484)
+++ trunk/lib/win64_vc12/OpenImageIO/include/OpenImageIO/sysutil.h	2015-02-02 18:46:48 UTC (rev 61485)
@@ -37,8 +37,7 @@
 /////////////////////////////////////////////////////////////////////////
 
 
-#ifndef OPENIMAGEIO_SYSUTIL_H
-#define OPENIMAGEIO_SYSUTIL_H
+#pragma once
 
 #include <string>
 #include <time.h>
@@ -49,56 +48,11 @@
 
 #include "export.h"
 #include "oiioversion.h"
+#include "platform.h"
 
-/// allocates memory, equivalent of C99 type var_name[size]
-#define ALLOCA(type, size) ((type*)alloca((size) * sizeof (type)))
 
+OIIO_NAMESPACE_ENTER {
 
-// Define a macro that can be used for memory alignment.

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list