Update openimageio to 1.5.16

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.

Release 1.5.14 (14 April 2015) -- compared to 1.5.13)
----------------------------------------------
* Added Python bindings for DeepData and deep reads (ImageInput) and
  writes (ImageOutput).
* Improve IBA::compare() (and therefore oiiotool -diff and idiff) when
  the images being compared have NaN or Inf values.
* TextureSystem bug fix that occasionally resulted in NaN in the alpha
  channel result when looking up from 3-channel images.
* Fix IBA::channels() bugs when dealing with "deep" images.
* Fix bugs in reading deep OpenEXR images with mixed channel types.
* fmath: safe_fast_pow improves the precision of its results for
  special cases of pow(x,1) and pow(x,2).
* Fix warnings when compiling with C++11.
* Dont link Python framework on OSX.
* Added TypeDesc::TypeHalf().
* Python ImageSpec.set_channel_formats() now works when the channel
  type lists are either TypeDesc, in addition to the existing support
  for BASETYPE.
* Build correctly against older TIFF versions.

Release 1.5.13 (10 Mar 2015) -- compared to 1.5.12)
----------------------------------------------
 * oiiotool: Bug fix for frame sequences -- could crash in Windows.
 * New ImageOutput::supports() tags: supports("alpha") should be true for
   image formats that support an alpha channel, supports("nchannels") should
   be true for output formats that support an arbitrary number of output
   channels.
 * oiiotool: Gracefully handle requests to save an image with more channels
   than the output file format can handle. Instead of being a fatal error,
   now it's just a warning, and extra channels are dropped. It tries to
   to find R, G, B, and A channels, saving them. If those names are
   not found, it just saves the first 3 (or 4) channels.
 * Improved handling of "PixelAspectRatio" for JPEG, TIFF, and OpenEXR.
 * oiiotool: Improve error messages when files can't be read. It is now
   easier to to distinguish files that don't exist from those that
   are an unknown format from those that are corrupted or have read
   errors.
 * maketx now writes to a temporary file, then moving it to the final
   requested output filename only when the write completed without error.
   This prevents situations where maketx crashes or is killed and leaves
   behind a file that looks correct but is actually corrupted or
   truncated.
 * Python: added previously-M.I.A. ImageSpec.erase_attribute().
 * Add Filesystem::rename() utility.
 * Made TypeDesc::equivalent accept comparisons of arrays of unspecified
   length with ones of definite length.
 * oiiotool & maketx have improved error message when unknown data format
   names are requested with "-d".
 * oiiotool numeric wildcard improvement: allow more digits to match.
 * Remove dependency of OpenSSL by default.

Release 1.5.12 (11 Feb 2015) -- compared to 1.5.11)
----------------------------------------------
* Various build fixes for Windows.
* New CMake build-time option to specify the default plugin search path.
  (1.5.12)
* OpenEXR: fixed write_tile() with AutoStride calculated the wrong
  default strides for "edge" tiles when the image width or length was
  not an integer multiple of the tile size. Also clarified the PDF and
  imageio.h docs in how they explain strides for this case. (1.5.12)
* maketx: when the source image was a crop (data window != display window),
  and the sharpening filters were used, it would incorrectly issue an
  "unknown filter name" error. (1.5.12)
* Fix gcc 5.0 compiler warning in PtexHalf.cpp. (1.5.12)

Release 1.5.11 (28 Jan 2015) -- compared to 1.5.10)
----------------------------------------------
* Fix build breaks for very old versions of Ilmbase (1.6 and earlier)
  that lack a definition of V4f used by our simd.h.
* Fix signed/unsigned warning on 32 bit platforms in jpeginput.cpp.

Release 1.5 (26 Jan 2015) -- compared to 1.4.x
----------------------------------------------
Major new features and improvements:
* New oiiotool functionality/commands:
   * --rotate90, --rotate180, --rotate270 rotate the image in 90 degree
     axially-aligned increments with no filtering. (1.5.2)
   * --reorient will perform whatever series of rotations or flips are
     necessary to move the pixels to match the "Orientation" metadata that
     describes the desired display orientation. (1.5.2)
   * --autoorient will automatically do the equivalent of --reorient on
     every image as it is read in, if it has a nonstandard orientation.
     (This is generally a good idea to use if you are using oiiotool to
     combine images that may have different orientations.) (1.5.2)
   * --rotate rotates an image by arbitrary angle and center point,
     with high-quality filtering. (1.5.3)
   * --warp transforms an image using a 3x3 matrix, with high-quality
     filtering. (1.5.3)
   * --median performs a median filter. (1.5.4)
* New ImageBufAlgo functions:
   * rotate90(), rotate180(), rotate270() rotate the image in 90 degree
     axially-aligned increments with no filtering. (1.5.2)
   * reorient() will perform whatever series of rotations or flips are
     necessary to move the pixels to match the "Orientation" metadata that
     describes the desired display orientation. (1.5.2)
   * rotate() performs rotation with arbitrary angle and center point,
     with high-quality filtering. (1.5.3)
   * warp() transforms an image by a 3x3 matrix, with high-quality
     filtering. (1.5.3)
   * median_filter performs a median filter. (1.5.4)
* Significant internal speedups by utilizing SIMD instructions (SSE) in
  the TextureSystem (1.5.5 , 1.5.6 ). To use this to its
  fullest extent, build OIIO with the make/cmake option USE_SIMD=arch,
  where arch is sse2, ssse3, sse4.1, sse4.2, depending on what machines
  you'll be deploying to. (Note that x86_64 automatically implies at
  least sse2.) We're finding that this has approximately doubled the
  speed of the math part of texture mapping (it doesn't speed up the disk
  I/O, of course).  (1.5.5)
* Basic support for many movie files via a plugin using 'ffmpeg'. Works
  with avi, mov, qt, mp4, m4a, 3gp, 3g2, mj2, m4v, mpg, and more.  Movie
  files simply look like multi-image files to OIIO. There isn't really
  support for audio yet, and although this lets you retrieve and process
  individual frames of a movie file, OIIO is still not meant to be a
  video-processing library. Currently, these formats can be read, but
  there is no write support (maybe coming soon). (1.5.5)
* Nuke plugins -- a txReader plugins that will read OIIO texture files,
  and a txWriter that will output proper (tiled & mip-mapped) texture files
  from Nuke. Contributed by Nathan Rusch / Luma Pictures. (1.5.6)

6 files changed, 13 insertions, 135 deletions

diff --git a/graphics/openimageio/Makefile b/graphics/openimageio/Makefile
index a58d7e6bd2c..3a9c36e47a8 100644
--- a/graphics/openimageio/Makefile
+++ b/graphics/openimageio/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.35 2015/04/25 14:23:17 tnn Exp $
+# $NetBSD: Makefile,v 1.36 2015/12/15 09:29:04 markd Exp $
 
-OIIOVER=	1.4.10
+OIIOVER=	1.5.16
 DISTNAME=	oiio-Release-${OIIOVER}
 PKGNAME=	${DISTNAME:S/oiio-Release/openimageio/}
-PKGREVISION=	6
 CATEGORIES=	graphics
 MASTER_SITES=	-https://github.com/OpenImageIO/oiio/archive/Release-${OIIOVER}.tar.gz
 
@@ -16,7 +15,6 @@ USE_CMAKE=		yes
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		gmake
 
-CXXFLAGS+=		-std=c++0x
 CXXFLAGS.Linux+=	-pthread
 
 CMAKE_ARGS+=		-DILMBASE_HOME:STRING=${BUILDLINK_PREFIX.ilmbase}
diff --git a/graphics/openimageio/PLIST b/graphics/openimageio/PLIST
index 97fb3b1506c..94ea3e0f43e 100644
--- a/graphics/openimageio/PLIST
+++ b/graphics/openimageio/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2014/07/09 20:00:01 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.5 2015/12/15 09:29:04 markd Exp $
 bin/iconvert
 bin/idiff
 bin/igrep
@@ -23,15 +23,18 @@ include/OpenImageIO/imagebufalgo.h
 include/OpenImageIO/imagebufalgo_util.h
 include/OpenImageIO/imagecache.h
 include/OpenImageIO/imageio.h
+include/OpenImageIO/missing_math.h
 include/OpenImageIO/oiioversion.h
 include/OpenImageIO/optparser.h
 include/OpenImageIO/osdep.h
 include/OpenImageIO/paramlist.h
+include/OpenImageIO/platform.h
 include/OpenImageIO/plugin.h
 include/OpenImageIO/pugiconfig.hpp
 include/OpenImageIO/pugixml.cpp
 include/OpenImageIO/pugixml.hpp
 include/OpenImageIO/refcnt.h
+include/OpenImageIO/simd.h
 include/OpenImageIO/strided_ptr.h
 include/OpenImageIO/string_ref.h
 include/OpenImageIO/string_view.h
@@ -48,8 +51,8 @@ include/OpenImageIO/ustring.h
 include/OpenImageIO/varyingref.h
 include/OpenImageIO/version.h
 lib/libOpenImageIO.so
-lib/libOpenImageIO.so.1.4
+lib/libOpenImageIO.so.1.5
 lib/libOpenImageIO.so.${PKGVERSION}
 lib/libOpenImageIO_Util.so
-lib/libOpenImageIO_Util.so.1.4
+lib/libOpenImageIO_Util.so.1.5
 lib/libOpenImageIO_Util.so.${PKGVERSION}
diff --git a/graphics/openimageio/distinfo b/graphics/openimageio/distinfo
index 7698d8caf8c..83d65156b88 100644
--- a/graphics/openimageio/distinfo
+++ b/graphics/openimageio/distinfo
@@ -1,16 +1,13 @@
-$NetBSD: distinfo,v 1.12 2015/11/03 21:34:11 agc Exp $
+$NetBSD: distinfo,v 1.13 2015/12/15 09:29:04 markd Exp $
 
-SHA1 (oiio-Release-1.4.10.tar.gz) = b02b238c4b41e33fb070300d1017fd533c703bf7
-RMD160 (oiio-Release-1.4.10.tar.gz) = e86ba7f7aba8e8ed67a85b3d0ecb84c8107854e8
-SHA512 (oiio-Release-1.4.10.tar.gz) = 9565544f20aac2dd0dd9940f9a615899255cf0a6a242a7ece6eeb4f509f60b0f48d3a837da5b758ab31fcec525c59a1950d2c9b7b50d05ba84cda4214c24765e
-Size (oiio-Release-1.4.10.tar.gz) = 17535558 bytes
+SHA1 (oiio-Release-1.5.16.tar.gz) = 9e067be3bd191841faaa39352fee66a22352db19
+RMD160 (oiio-Release-1.5.16.tar.gz) = b4d17be7e2d074b2e5a936834c5540242f7603e7
+SHA512 (oiio-Release-1.5.16.tar.gz) = 8ecf2b42875b05aa72a227e56f8c247560d8e53505d51812449afa57db39e7c8425c1fdfa87a08b22c0592a24e457fba4b98ad91642168e45d99753ca4cf7b8e
+Size (oiio-Release-1.5.16.tar.gz) = 23136543 bytes
 SHA1 (patch-CMakeLists.txt) = cce7fabfd51526847ea964fa7fd5ca3e8a6b08e7
 SHA1 (patch-src_cmake_modules_FindOpenJpeg.cmake) = 5c68708dc0c987c27719e63ab634bcdcde4d7bee
 SHA1 (patch-src_cmake_oiio__macros.cmake) = 37962a7256e1e82b6ffa1b16bfc771ea3812fae3
 SHA1 (patch-src_cmake_platform.cmake) = b7c8f459499563f6aeb0de270087d1993db67af3
-SHA1 (patch-src_dpx.imageio_libdpx_DPXColorConverter.cpp) = e758c6fc1960575f6471c28f03180031875cdf5d
-SHA1 (patch-src_gif.imageio_gifinput.cpp) = 5a4d0879c202e861c252a3c46bfcafdf41f48a68
 SHA1 (patch-src_libutil_sysutil.cpp) = 6a4418cd4557d036fd94b747a7630bdce0abd4be
 SHA1 (patch-src_make_detectplatform.mk) = d62c332ad559cca3a5f135bc8cdd69cc89a6c196
-SHA1 (patch-src_psd.imageio_psdinput.cpp) = 9a0678f39762883f04a28ec143e3c026b73955d9
 SHA1 (patch-src_ptex.imageio_ptex_PtexPlatform.h) = 9fad164cda52e35d42128a55d63057dae8ddac35
diff --git a/graphics/openimageio/patches/patch-src_dpx.imageio_libdpx_DPXColorConverter.cpp b/graphics/openimageio/patches/patch-src_dpx.imageio_libdpx_DPXColorConverter.cpp
deleted file mode 100644
index ff6cbccbdae..00000000000
--- a/graphics/openimageio/patches/patch-src_dpx.imageio_libdpx_DPXColorConverter.cpp
+++ /dev/null
@@ -1,94 +0,0 @@
-$NetBSD: patch-src_dpx.imageio_libdpx_DPXColorConverter.cpp,v 1.1 2014/04/07 12:15:55 ryoon Exp $
-
---- src/dpx.imageio/libdpx/DPXColorConverter.cpp.orig	2014-04-03 06:08:57.000000000 +0000
-+++ src/dpx.imageio/libdpx/DPXColorConverter.cpp
-@@ -90,7 +90,7 @@ namespace dpx {
- 		}
- 	}
- 
--	template <typename DATA, int max>
-+	template <typename DATA, unsigned int max>
- 	static inline void ConvertPixelYCbCrToRGB(const DATA CbYCr[3], DATA RGB[3], const float matrix[9]) {
- 		float tmp;
- 		for (int i = 0; i < 3; i++) {
-@@ -106,7 +106,7 @@ namespace dpx {
- 	}
- 
- 	// 4:4:4
--	template <typename DATA, int max>
-+	template <typename DATA, unsigned int max>
- 	static bool ConvertCbYCrToRGB(const Characteristic space, const DATA *input, DATA *output, const int pixels) {
- 		const float *matrix = GetYCbCrToRGBColorMatrix(space);
- 		if (matrix == NULL)
-@@ -120,7 +120,7 @@ namespace dpx {
- 	}
- 
- 	// 4:4:4:4
--	template <typename DATA, int max>
-+	template <typename DATA, unsigned int max>
- 	static bool ConvertCbYCrAToRGBA(const Characteristic space, const DATA *input, DATA *output, const int pixels) {
- 		const float *matrix = GetYCbCrToRGBColorMatrix(space);
- 		if (matrix == NULL)
-@@ -135,7 +135,7 @@ namespace dpx {
- 	}
- 
- 	// 4:2:2
--	template <typename DATA, int max>
-+	template <typename DATA, unsigned int max>
- 	static bool ConvertCbYCrYToRGB(const Characteristic space, const DATA *input, DATA *output, const int pixels) {
- 		const float *matrix = GetYCbCrToRGBColorMatrix(space);
- 		if (matrix == NULL)
-@@ -154,7 +154,7 @@ namespace dpx {
- 	}
- 
- 	// 4:2:2:4
--	template <typename DATA, int max>
-+	template <typename DATA, unsigned int max>
- 	static bool ConvertCbYACrYAToRGBA(const Characteristic space, const DATA *input, DATA *output, const int pixels) {
- 		const float *matrix = GetYCbCrToRGBColorMatrix(space);
- 		if (matrix == NULL)
-@@ -390,7 +390,7 @@ namespace dpx {
- 		}
- 	}
- 
--	template <typename DATA, int max>
-+	template <typename DATA, unsigned int max>
- 	static inline void ConvertPixelRGBToYCbCr(const DATA RGB[3], DATA CbYCr[3], const float matrix[9]) {
- 		float tmp;
- 		for (int i = 0; i < 3; i++) {
-@@ -407,7 +407,7 @@ namespace dpx {
- 	}
- 
- 	// 4:4:4
--	template <typename DATA, int max>
-+	template <typename DATA, unsigned int max>
- 	static bool ConvertRGBToCbYCr(const Characteristic space, const DATA *input, DATA *output, const int pixels) {
- 		const float *matrix = GetRGBToYCbCrColorMatrix(space);
- 		if (matrix == NULL)
-@@ -421,7 +421,7 @@ namespace dpx {
- 	}
- 
- 	// 4:4:4:4
--	template <typename DATA, int max>
-+	template <typename DATA, unsigned int max>
- 	static bool ConvertRGBAToCbYCrA(const Characteristic space, const DATA *input, DATA *output, const int pixels) {
- 		const float *matrix = GetRGBToYCbCrColorMatrix(space);
- 		if (matrix == NULL)
-@@ -436,7 +436,7 @@ namespace dpx {
- 	}
- 
- 	// 4:2:2
--	template <typename DATA, int max>
-+	template <typename DATA, unsigned int max>
- 	static bool ConvertRGBToCbYCrY(const Characteristic space, const DATA *input, DATA *output, const int pixels) {
- 		const float *matrix = GetRGBToYCbCrColorMatrix(space);
- 		if (matrix == NULL)
-@@ -454,7 +454,7 @@ namespace dpx {
- 	}
- 
- 	// 4:2:2:4
--	template <typename DATA, int max>
-+	template <typename DATA, unsigned int max>
- 	static bool ConvertRGBAToCbYACrYA(const Characteristic space, const DATA *input, DATA *output, const int pixels) {
- 		const float *matrix = GetRGBToYCbCrColorMatrix(space);
- 		if (matrix == NULL)
diff --git a/graphics/openimageio/patches/patch-src_gif.imageio_gifinput.cpp b/graphics/openimageio/patches/patch-src_gif.imageio_gifinput.cpp
deleted file mode 100644
index bd74a667878..00000000000
--- a/graphics/openimageio/patches/patch-src_gif.imageio_gifinput.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_gif.imageio_gifinput.cpp,v 1.1 2014/05/30 11:33:32 joerg Exp $
-
---- src/gif.imageio/gifinput.cpp.orig	2014-05-28 13:28:44.000000000 +0000
-+++ src/gif.imageio/gifinput.cpp
-@@ -497,7 +497,7 @@ inline bool
- GIFInput::close (void)
- {
-     if (m_gif_file) {
--        if (DGifCloseFile (m_gif_file) == GIF_ERROR) {
-+        if (DGifCloseFile (m_gif_file, NULL) == GIF_ERROR) {
-             error ("Error trying to close the file.");
-             return false;
-         }
diff --git a/graphics/openimageio/patches/patch-src_psd.imageio_psdinput.cpp b/graphics/openimageio/patches/patch-src_psd.imageio_psdinput.cpp
deleted file mode 100644
index cf96ff939a1..00000000000
--- a/graphics/openimageio/patches/patch-src_psd.imageio_psdinput.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_psd.imageio_psdinput.cpp,v 1.1 2014/04/07 12:15:55 ryoon Exp $
-
---- src/psd.imageio/psdinput.cpp.orig	2014-04-03 06:08:57.000000000 +0000
-+++ src/psd.imageio/psdinput.cpp
-@@ -389,7 +389,7 @@ private:
-         // For debugging, numeric_cast will throw if precision is lost:
-         // value = boost::numeric_cast<TVariable>(buffer);
-         value = buffer;
--        return m_file;
-+        return !m_file.bad();
-     }
- 
-     int read_pascal_string (std::string &s, uint16_t mod_padding);