Merge pull request #1337 from vfxenjoyer/oiio-backwards-compatiblity

ImageReader : Check for oiio version before calling read_native_deep_x

Author: johnhaddon

Changes

@@ -1,3 +1,11 @@
+10.4.x.x (relative to 10.4.5.0)
+========
+
+Fixes
+-----
+- ImageReader : Fixed compilation with versions of OIIO < 2.4
+
+
 10.4.5.0 (relative to 10.4.4.0)
 ========
 

src/IECoreImage/ImageReader.cpp

@@ -166,8 +166,10 @@ class ImageReader::Implementation
 					if( !tiled )
 					{
 						return input->read_native_deep_scanlines(
+#if OIIO_VERSION >= 20400
 							0, // subimage
 							0, // miplevel
+#endif
 							spec->height + spec->y - 1,
 							spec->height + spec->y,
 							0, // first deep sample
@@ -188,8 +190,10 @@ class ImageReader::Implementation
 						// are doing things correctly, and this is an OIIO bug.  For the moment, just read in
 						// the whole image starting from the origin, because this doesn't crash.
 						return input->read_native_deep_tiles(
+#if OIIO_VERSION >= 20400
 							0, // subimage
 							0, // miplevel
+#endif
 							spec->x, spec->width + spec->x,
 							spec->y, spec->height + spec->y,
 							0, 1, // first deep sample