Skip to content

Commit 3852ad6

Browse files
authored
Merge pull request #1332 from johnhaddon/oiioCompatibility
ImageReader : Fix compilation with OIIO 2.4
2 parents b39a9bf + 32cc61e commit 3852ad6

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

Changes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ Build
1212
-----
1313

1414
- Update Windows release build dependencies to 6.2.1.
15+
- Added compatibility with OpenImageIO 2.4.
1516

1617
10.4.4.0 (relative to 10.4.3.1)
1718
========

src/IECoreImage/ImageReader.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,8 @@ class ImageReader::Implementation
166166
if( !tiled )
167167
{
168168
return input->read_native_deep_scanlines(
169+
0, // subimage
170+
0, // miplevel
169171
spec->height + spec->y - 1,
170172
spec->height + spec->y,
171173
0, // first deep sample
@@ -186,6 +188,8 @@ class ImageReader::Implementation
186188
// are doing things correctly, and this is an OIIO bug. For the moment, just read in
187189
// the whole image starting from the origin, because this doesn't crash.
188190
return input->read_native_deep_tiles(
191+
0, // subimage
192+
0, // miplevel
189193
spec->x, spec->width + spec->x,
190194
spec->y, spec->height + spec->y,
191195
0, 1, // first deep sample

0 commit comments

Comments
 (0)