Skip to content

Commit

Permalink
CI : Update to GafferHQ/dependencies 8.0.0a9
Browse files Browse the repository at this point in the history
This contains fixes to handling of DWA compression in OpenEXRCore, as demonstrated in the new ImageReader unit tests.
  • Loading branch information
johnhaddon committed Mar 22, 2024
1 parent 5e95d88 commit e107a27
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/main/installDependencies.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@

# Determine default archive URL.

defaultURL = "https://github.com/GafferHQ/dependencies/releases/download/8.0.0a8/gafferDependencies-8.0.0a8-{platform}{buildEnvironment}.{extension}"
defaultURL = "https://github.com/GafferHQ/dependencies/releases/download/8.0.0a9/gafferDependencies-8.0.0a9-{platform}{buildEnvironment}.{extension}"

# Parse command line arguments.

Expand Down
10 changes: 10 additions & 0 deletions Changes.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ Fixes
- Fixed error message to include filename [^1].
- Expression : `setExpression()` now respects configs that provide backwards compatibility for old plug names.
- Shuffle : Fixed default name for plugs constructed via the legacy `ChannelPlug( out, in )` constructor [^1].
- ImageReader :
- Fixed loading of OpenEXR images with 32 bit float data and DWA compression [^1].
- Fixed loading of secondary layers in OpenEXR images with DWA compression [^1].

API
---
Expand All @@ -36,6 +39,13 @@ Breaking Changes

- StandardLightVisualiser : Added `attributeName` argument to `surfaceTexture()` virtual method.

Build
-----

- OpenEXR : Applied patches from the following pull requests :
- https://github.com/AcademySoftwareFoundation/openexr/pull/1591
- https://github.com/AcademySoftwareFoundation/openexr/pull/1684

[^1]: To be omitted from final release notes for 1.4.0.0.

1.4.0.0b4 (relative to 1.4.0.0b3)
Expand Down
21 changes: 21 additions & 0 deletions python/GafferImageTest/ImageReaderTest.py
Original file line number Diff line number Diff line change
Expand Up @@ -959,5 +959,26 @@ def testSerialisation( self ) :
script2.execute( serialisation )
self.assertIsInstance( script2["reader"], GafferImage.ImageReader )

def testDWACompression( self ) :

reader = GafferImage.ImageReader()

stats = GafferImage.ImageStats()
stats["in"].setInput( reader["out"] )
stats["areaSource"].setValue( stats.AreaSource.DataWindow )

for file in [
"dwaHalfWithLayerPrefix.exr",
"dwaFloat.exr"
] :
with self.subTest( file = file ) :

reader["fileName"].setValue( self.imagesPath() / file )
stats["channels"].setValue( reader["out"].channelNames() )

for stat in ( "min", "max", "average" ) :
for c, expected in zip( stats[stat].getValue(), imath.Color4f( 0.3, 0.6, 0.9, 0 ) ) :
self.assertAlmostEqual( c, expected, delta = 0.0001 )

if __name__ == "__main__":
unittest.main()
Binary file added python/GafferImageTest/images/dwaFloat.exr
Binary file not shown.
Binary file not shown.

0 comments on commit e107a27

Please sign in to comment.