Skip to content

Commit

Permalink
Merge pull request #1332 from johnhaddon/oiioCompatibility
Browse files Browse the repository at this point in the history
ImageReader : Fix compilation with OIIO 2.4
  • Loading branch information
ericmehl authored Feb 8, 2023
2 parents b39a9bf + 32cc61e commit 3852ad6
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 0 deletions.
1 change: 1 addition & 0 deletions Changes
Original file line number Diff line number Diff line change
Expand Up @@ -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)
========
Expand Down
4 changes: 4 additions & 0 deletions src/IECoreImage/ImageReader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 3852ad6

Please sign in to comment.