Updated OIIO to 1.5.17.

This is needed by OSL 1.6.8.

build/buildOIIO.sh

@@ -2,7 +2,7 @@
 
 set -e
 
-cd `dirname $0`/../oiio-Release-1.5.13
+cd `dirname $0`/../oiio-Release-1.5.17
 
 mkdir -p $BUILD_DIR/doc/licenses
 cp LICENSE $BUILD_DIR/doc/licenses/openImageIO

oiio-Release-1.5.13/CHANGES → oiio-Release-1.5.17/CHANGES

@@ -1,5 +1,62 @@
 Changes:
 
+Release 1.5.17 (13 Jul 2015) -- compared to 1.5.16)
+---------------------------------------------------
+* Fix support for older ffmpeg version on Ubuntu 14.04. #1168
+* Fix bug in fft -- was not always zeroing out the imaginary channel. #1171
+* Build-time fixes for Nocona CPUs that have SSE3 without SSSE3. #1175
+* ustring fixes for new gcc (5.1+) and new std::string ABI. #1176
+* Fixes for unit test timer_test for new OSX versions with timer
+  coalescing. #1181
+* Fix bugs with rangecompress and rangeexpand when using luma. #1180
+* Fixes for clean build when using clang 3.6. #1182
+
+Release 1.5.16 (11 Jun 2015) -- compared to 1.5.15)
+---------------------------------------------------
+* PNG writes now honor PixelAspectRatio attribute.
+* Build fixes for Visual Studio 2010
+* PSD & JPEG plugins fixes for Win32 compilation.
+* Also search for OIIO plugins in [DY]LD_LIBRARY_PATH.
+* Give Strutil::parse_string an option to not strip surrounding quotes.
+* Fix Nuke plugin build files to not do anything if USE_NUKE=0
+* New ImageInput query: "procedural" -- returns 1 if the ImageInput may
+  not correspond to an actual file.
+* TypeDesc has a new constructor and fromstring of a string_view, in
+  addition to the old versions that took char*.
+* Eliminate spurious ImageCache invalidation just because the shared
+  cache is requested again.
+* Fixed trilinear MIPmap texture lookups that gave invalid alpha fill.
+* Filesystem: sequence matching should clear results arrays upon start.
+
+Release 1.5.15 (11 May 2015) -- compared to 1.5.14)
+---------------------------------------------------
+* Bug fix with IBA::channels() with deep data with UINT channels.
+* Fix TypeDesc compatibility with OSL.
+* Misc WIN32 / VS2010 fixes.
+* Fix incorrect logic in convert_image with certain channel types and
+  strides. #1144
+
+Release 1.5.14 (14 April 2015) -- compared to 1.5.13)
+----------------------------------------------
+* Added Python bindings for DeepData and deep reads (ImageInput) and
+  writes (ImageOutput). #1113 (1.5.13)
+* Improve IBA::compare() (and therefore oiiotool -diff and idiff) when
+  the images being compared have NaN or Inf values. #1109 (1.5.13)
+* TextureSystem bug fix that occasionally resulted in NaN in the alpha
+  channel result when looking up from 3-channel images. #1108 (1.5.13)
+* Fix IBA::channels() bugs when dealing with "deep" images. #1113 (1.5.13)
+* Fix bugs in reading deep OpenEXR images with mixed channel types.
+  #1113 (1.5.13)
+* fmath: safe_fast_pow improves the precision of its results for
+  special cases of pow(x,1) and pow(x,2). #1094 (1.5.13)
+* Fix warnings when compiling with C++11. (1.5.13)
+* Dont link Python framework on OSX. #1099 (1.5.13)
+* Added TypeDesc::TypeHalf(). #1113 (1.5.13)
+* Python ImageSpec.set_channel_formats() now works when the channel
+  type lists are either TypeDesc, in addition to the existing support
+  for BASETYPE. #1113 (1.5.13)
+* Build correctly against older TIFF versions. #1119 (1.5.13)
+
 Release 1.5.13 (10 Mar 2015) -- compared to 1.5.12)
 ----------------------------------------------
  * oiiotool: Bug fix for frame sequences -- could crash in Windows. #1060

oiio-Release-1.5.13/CMakeLists.txt → oiio-Release-1.5.17/CMakeLists.txt

@@ -3,7 +3,7 @@ project (OpenImageIO)
 # Release version of the library
 set (OIIO_VERSION_MAJOR 1)
 set (OIIO_VERSION_MINOR 5)
-set (OIIO_VERSION_PATCH 13)
+set (OIIO_VERSION_PATCH 17)
 set (OIIO_VERSION_RELEASE_TYPE "")   # "dev", "betaX", "RCY", ""
 
 cmake_minimum_required (VERSION 2.6)
@@ -42,15 +42,21 @@ message (STATUS "CMAKE_CXX_COMPILER is ${CMAKE_CXX_COMPILER}")
 message (STATUS "CMAKE_CXX_COMPILER_ID is ${CMAKE_CXX_COMPILER_ID}")
 if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     set (CMAKE_COMPILER_IS_CLANG 1)
-    message (STATUS "Using clang as the compiler")
 endif ()
-# Second try: for earlier versions of CMake, the CMAKE_CXX_COMPILER_ID
-# appears to be unreliable and may say "GNU" despite using clang, so
-# directly match against the compiler name.
 if (CMAKE_CXX_COMPILER MATCHES "[Cc]lang")
+    # Second try: for earlier versions of CMake, the CMAKE_CXX_COMPILER_ID
+    # appears to be unreliable and may say "GNU" despite using clang, so
+    # directly match against the compiler name.
     set (CMAKE_COMPILER_IS_CLANG 1)
-    message (STATUS "The compiler seems to be clang")
 endif ()
+if (CMAKE_COMPILER_IS_CLANG)
+    if (NOT CLANG_VERSION_STRING)
+        EXECUTE_PROCESS( COMMAND ${CMAKE_CXX_COMPILER} --version OUTPUT_VARIABLE clang_full_version_string )
+        string (REGEX REPLACE ".*clang version ([0-9]+\\.[0-9]+).*" "\\1" CLANG_VERSION_STRING ${clang_full_version_string})
+    endif ()
+    message (STATUS "The compiler is Clang version ${CLANG_VERSION_STRING}")
+endif ()
+
 if (CMAKE_CXX_COMPILER_ID MATCHES "Intel")
     set (CMAKE_COMPILER_IS_INTEL 1)
     message (STATUS "Using Intel as the compiler")
@@ -86,6 +92,9 @@ if (CMAKE_COMPILER_IS_CLANG)
     add_definitions ("-Qunused-arguments")
     # Don't warn if we ask it not to warn about warnings it doesn't know
     add_definitions ("-Wunknown-warning-option")
+    if (CLANG_VERSION_STRING VERSION_GREATER 3.5)
+        add_definitions ("-Wno-unused-local-typedefs")
+    endif ()
 endif ()
 
 if (CMAKE_COMPILER_IS_GNUCC AND (NOT CMAKE_COMPILER_IS_CLANG) AND (NOT ${GCC_VERSION} VERSION_LESS 4.8))
@@ -418,7 +427,7 @@ oiio_add_tests (gpsread misnamed-file nonwhole-tiles
                 oiiotool-readerror oiiotool-text
                 perchannel dither
                 dpx ico iff png psd rla sgi
-                python-typedesc python-imagespec python-roi
+                python-typedesc python-imagespec python-roi python-deep
                 python-imageinput python-imageoutput
                 python-imagebuf python-imagebufalgo
                 maketx