Skip to content

Commit 84fb98d

Browse files
committed
IECoreImageTest : Adapt for OIIO 3 metadata changes
1 parent fa3e654 commit 84fb98d

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

test/IECoreImage/ImageReaderTest.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ def testHeaderToBlindData( self ) :
218218

219219
dictHeader = {
220220
'channelNames': IECore.StringVectorData( [ "R", "G", "B" ] ),
221-
'oiio:ColorSpace': IECore.StringData( "Linear" ),
221+
'oiio:ColorSpace': IECore.StringData( "lin_rec709" if IECoreImage.OpenImageIOAlgo.version() >= 30000 else "Linear" ),
222222
'compression': IECore.StringData( "piz" ),
223223
'screenWindowCenter': IECore.V2fData( imath.V2f(0,0) ),
224224
'displayWindow': IECore.Box2iData( imath.Box2i( imath.V2i(0,0), imath.V2i(511,255) ) ),
@@ -229,6 +229,9 @@ def testHeaderToBlindData( self ) :
229229
}
230230
if IECoreImage.OpenImageIOAlgo.version() >= 20206 :
231231
dictHeader['oiio:subimages'] = IECore.IntData( 1 )
232+
if IECoreImage.OpenImageIOAlgo.version() >= 30000 :
233+
dictHeader["openexr:lineOrder"] = IECore.StringData( "increasingY" )
234+
dictHeader["screenWindowCenter"] = IECore.V2fData( imath.V2f( 0 ) )
232235

233236
r = IECore.Reader.create( os.path.join( "test", "IECoreImage", "data", "exr", "uvMap.512x256.exr" ) )
234237
header = r.readHeader()

test/IECoreImage/ImageWriterTest.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -418,6 +418,8 @@ def testBlindDataToHeader( self ) :
418418
del imgBlindData['oiio:ColorSpace']
419419
if IECoreImage.OpenImageIOAlgo.version() >= 20206 :
420420
del imgBlindData['oiio:subimages']
421+
if IECoreImage.OpenImageIOAlgo.version() >= 30000 :
422+
del imgBlindData["openexr:lineOrder"]
421423
del imgBlindData['compression']
422424
del imgBlindData['PixelAspectRatio']
423425
del imgBlindData['displayWindow']

0 commit comments

Comments
 (0)