File tree Expand file tree Collapse file tree
testsuite/openexr-compression Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -470,6 +470,17 @@ macro (oiio_add_all_tests)
470470 URL http://github.com/AcademySoftwareFoundation/openexr-images )
471471 endif ()
472472
473+ # HTJ2K was introduced in OpenEXR v.3.4.0
474+ if (OpenEXR_VERSION VERSION_GREATER_EQUAL 3.4.0)
475+ if (TEST openexr-compression)
476+ set_property (TEST openexr-compression APPEND PROPERTY ENVIRONMENT
477+ "OIIO_OPENEXR_HTJ2K_SUPPORT=1" )
478+ endif ()
479+ if (TEST openexr-compression.core)
480+ set_property (TEST openexr-compression.core APPEND PROPERTY
481+ ENVIRONMENT "OIIO_OPENEXR_HTJ2K_SUPPORT=1" )
482+ endif ()
483+ endif ()
473484 # New compression tests of zstd and lj2k require OpenEXR main branch,
474485 # or latest release or at least V3.5.0
475486 if (OpenEXR_VERSION VERSION_GREATER_EQUAL 3.5.0)
Original file line number Diff line number Diff line change 1+ out-none.exr compression none
2+ out-rle.exr compression rle
3+ out-zips.exr compression zips
4+ out-zip.exr compression zip
5+ out-piz.exr compression piz
6+ out-pxr24.exr compression pxr24
7+ out-b44.exr compression b44
8+ out-b44a.exr compression b44a
9+ out-dwaa.exr compression dwaa
10+ out-dwab.exr compression dwab
11+ Comparing "out-none.exr" and "ref/out-zip.exr"
12+ PASS
13+ Comparing "out-rle.exr" and "ref/out-zip.exr"
14+ PASS
15+ Comparing "out-zips.exr" and "ref/out-zip.exr"
16+ PASS
17+ Comparing "out-zip.exr" and "ref/out-zip.exr"
18+ PASS
19+ Comparing "out-piz.exr" and "ref/out-zip.exr"
20+ PASS
21+ Comparing "out-pxr24.exr" and "ref/out-zip.exr"
22+ PASS
23+ Comparing "out-b44.exr" and "ref/out-b44.exr"
24+ PASS
25+ Comparing "out-b44a.exr" and "ref/out-b44.exr"
26+ PASS
27+ Comparing "out-dwaa.exr" and "ref/out-dwaa.exr"
28+ PASS
29+ Comparing "out-dwab.exr" and "ref/out-dwaa.exr"
30+ PASS
Original file line number Diff line number Diff line change @@ -8,6 +8,8 @@ out-b44.exr compression b44
88out-b44a.exr compression b44a
99out-dwaa.exr compression dwaa
1010out-dwab.exr compression dwab
11+ out-htj2k32.exr compression htj2k32
12+ out-htj2k256.exr compression htj2k256
1113Comparing "out-none.exr" and "ref/out-zip.exr"
1214PASS
1315Comparing "out-rle.exr" and "ref/out-zip.exr"
@@ -28,3 +30,7 @@ Comparing "out-dwaa.exr" and "ref/out-dwaa.exr"
2830PASS
2931Comparing "out-dwab.exr" and "ref/out-dwaa.exr"
3032PASS
33+ Comparing "out-htj2k32.exr" and "ref/out-zip.exr"
34+ PASS
35+ Comparing "out-htj2k256.exr" and "ref/out-zip.exr"
36+ PASS
Original file line number Diff line number Diff line change @@ -8,6 +8,8 @@ out-b44.exr compression b44
88out-b44a.exr compression b44a
99out-dwaa.exr compression dwaa
1010out-dwab.exr compression dwab
11+ out-htj2k32.exr compression htj2k32
12+ out-htj2k256.exr compression htj2k256
1113out-lj2k.exr compression lj2k
1214out-zstd.exr compression zstd
1315Comparing "out-none.exr" and "ref/out-zip.exr"
@@ -30,6 +32,10 @@ Comparing "out-dwaa.exr" and "ref/out-dwaa.exr"
3032PASS
3133Comparing "out-dwab.exr" and "ref/out-dwaa.exr"
3234PASS
35+ Comparing "out-htj2k32.exr" and "ref/out-zip.exr"
36+ PASS
37+ Comparing "out-htj2k256.exr" and "ref/out-zip.exr"
38+ PASS
3339Comparing "out-lj2k.exr" and "ref/out-lj2k.exr"
3440PASS
3541Comparing "out-zstd.exr" and "ref/out-zip.exr"
Original file line number Diff line number Diff line change 2121 "dwab" ,
2222]
2323
24+ if os .getenv ("OIIO_OPENEXR_HTJ2K_SUPPORT" ) == "1" :
25+ compressions += ["htj2k32" , "htj2k256" ]
2426if os .getenv ("OIIO_OPENEXR_LJ2K_ZSTD_SUPPORT" ) == "1" :
2527 compressions += ["lj2k" , "zstd" ]
2628
You can’t perform that action at this time.
0 commit comments