From 32cc61e4e8cc40990c18b3d954a619e72362bb73 Mon Sep 17 00:00:00 2001 From: John Haddon Date: Wed, 8 Feb 2023 09:37:53 +0000 Subject: [PATCH] ImageReader : Fix compilation with OIIO 2.4 We were using the old form of the function, which is now deprecated. --- Changes | 1 + src/IECoreImage/ImageReader.cpp | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/Changes b/Changes index 7f98d6d152..08a59344c8 100644 --- a/Changes +++ b/Changes @@ -12,6 +12,7 @@ Build ----- - Update Windows release build dependencies to 6.2.1. +- Added compatibility with OpenImageIO 2.4. 10.4.4.0 (relative to 10.4.3.1) ======== diff --git a/src/IECoreImage/ImageReader.cpp b/src/IECoreImage/ImageReader.cpp index 9188d6d4f6..36acce1405 100644 --- a/src/IECoreImage/ImageReader.cpp +++ b/src/IECoreImage/ImageReader.cpp @@ -166,6 +166,8 @@ class ImageReader::Implementation if( !tiled ) { return input->read_native_deep_scanlines( + 0, // subimage + 0, // miplevel spec->height + spec->y - 1, spec->height + spec->y, 0, // first deep sample @@ -186,6 +188,8 @@ 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( + 0, // subimage + 0, // miplevel spec->x, spec->width + spec->x, spec->y, spec->height + spec->y, 0, 1, // first deep sample