Skip to content

Commit 5403c60

Browse files
committed
ci: Fix testsuite/heif ref output (#4892)
PR #4880 checked in some output reference that contained version numbers, which passed in main but failed when backported to 3.1. This repairs it and makes the output suitable for any version that contains the patch. Signed-off-by: Larry Gritz <[email protected]>
1 parent cb679f2 commit 5403c60

File tree

8 files changed

+1
-15
lines changed

8 files changed

+1
-15
lines changed

testsuite/heif/ref/out-libheif1.12-orient.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,8 @@ cicp_pq.avif : 16 x 16, 4 channel, uint10 heif
6060
SHA-1: 0F3CAB52D479BC23E9C981DBADDFEF1F792E5540
6161
channel list: R, G, B, A
6262
CICP: 9, 16, 9, 1
63-
Software: "OpenImageIO 3.2.0.0dev : A50DC799B2B4CA667217608C0F82302455E5D32A"
6463
Exif:ExifVersion: "0230"
6564
Exif:FlashPixVersion: "0100"
66-
Exif:ImageHistory: "oiiotool --pattern fill:topleft=1,0,0,1:topright=0,1,0,1:bottomleft=0,0,1,1:bottomright=1,1,1,1 16x16 4 -d uint16 -o test16.png"
6765
heif:UnassociatedAlpha: 1
6866
oiio:BitsPerSample: 10
6967
oiio:ColorSpace: "srgb_rec709_scene"

testsuite/heif/ref/out-libheif1.4.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,8 @@ cicp_pq.avif : 16 x 16, 4 channel, uint10 heif
6060
SHA-1: 0F3CAB52D479BC23E9C981DBADDFEF1F792E5540
6161
channel list: R, G, B, A
6262
CICP: 9, 16, 9, 1
63-
Software: "OpenImageIO 3.2.0.0dev : A50DC799B2B4CA667217608C0F82302455E5D32A"
6463
Exif:ExifVersion: "0230"
6564
Exif:FlashPixVersion: "0100"
66-
Exif:ImageHistory: "oiiotool --pattern fill:topleft=1,0,0,1:topright=0,1,0,1:bottomleft=0,0,1,1:bottomright=1,1,1,1 16x16 4 -d uint16 -o test16.png"
6765
heif:UnassociatedAlpha: 1
6866
oiio:BitsPerSample: 10
6967
oiio:ColorSpace: "srgb_rec709_scene"

testsuite/heif/ref/out-libheif1.5.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,8 @@ cicp_pq.avif : 16 x 16, 4 channel, uint10 heif
6060
SHA-1: 0F3CAB52D479BC23E9C981DBADDFEF1F792E5540
6161
channel list: R, G, B, A
6262
CICP: 9, 16, 9, 1
63-
Software: "OpenImageIO 3.2.0.0dev : A50DC799B2B4CA667217608C0F82302455E5D32A"
6463
Exif:ExifVersion: "0230"
6564
Exif:FlashPixVersion: "0100"
66-
Exif:ImageHistory: "oiiotool --pattern fill:topleft=1,0,0,1:topright=0,1,0,1:bottomleft=0,0,1,1:bottomright=1,1,1,1 16x16 4 -d uint16 -o test16.png"
6765
heif:UnassociatedAlpha: 1
6866
oiio:BitsPerSample: 10
6967
oiio:ColorSpace: "srgb_rec709_scene"

testsuite/heif/ref/out-libheif1.9-alt2.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,8 @@ cicp_pq.avif : 16 x 16, 4 channel, uint10 heif
6060
SHA-1: 0F3CAB52D479BC23E9C981DBADDFEF1F792E5540
6161
channel list: R, G, B, A
6262
CICP: 9, 16, 9, 1
63-
Software: "OpenImageIO 3.2.0.0dev : A50DC799B2B4CA667217608C0F82302455E5D32A"
6463
Exif:ExifVersion: "0230"
6564
Exif:FlashPixVersion: "0100"
66-
Exif:ImageHistory: "oiiotool --pattern fill:topleft=1,0,0,1:topright=0,1,0,1:bottomleft=0,0,1,1:bottomright=1,1,1,1 16x16 4 -d uint16 -o test16.png"
6765
heif:UnassociatedAlpha: 1
6866
oiio:BitsPerSample: 10
6967
oiio:ColorSpace: "srgb_rec709_scene"

testsuite/heif/ref/out-libheif1.9-with-av1-alt2.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,8 @@ cicp_pq.avif : 16 x 16, 4 channel, uint10 heif
6060
SHA-1: 0F3CAB52D479BC23E9C981DBADDFEF1F792E5540
6161
channel list: R, G, B, A
6262
CICP: 9, 16, 9, 1
63-
Software: "OpenImageIO 3.2.0.0dev : A50DC799B2B4CA667217608C0F82302455E5D32A"
6463
Exif:ExifVersion: "0230"
6564
Exif:FlashPixVersion: "0100"
66-
Exif:ImageHistory: "oiiotool --pattern fill:topleft=1,0,0,1:topright=0,1,0,1:bottomleft=0,0,1,1:bottomright=1,1,1,1 16x16 4 -d uint16 -o test16.png"
6765
heif:UnassociatedAlpha: 1
6866
oiio:BitsPerSample: 10
6967
oiio:ColorSpace: "srgb_rec709_scene"

testsuite/heif/ref/out-libheif1.9-with-av1.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,8 @@ cicp_pq.avif : 16 x 16, 4 channel, uint10 heif
6060
SHA-1: 0F3CAB52D479BC23E9C981DBADDFEF1F792E5540
6161
channel list: R, G, B, A
6262
CICP: 9, 16, 9, 1
63-
Software: "OpenImageIO 3.2.0.0dev : A50DC799B2B4CA667217608C0F82302455E5D32A"
6463
Exif:ExifVersion: "0230"
6564
Exif:FlashPixVersion: "0100"
66-
Exif:ImageHistory: "oiiotool --pattern fill:topleft=1,0,0,1:topright=0,1,0,1:bottomleft=0,0,1,1:bottomright=1,1,1,1 16x16 4 -d uint16 -o test16.png"
6765
heif:UnassociatedAlpha: 1
6866
oiio:BitsPerSample: 10
6967
oiio:ColorSpace: "srgb_rec709_scene"

testsuite/heif/ref/out-libheif1.9.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,8 @@ cicp_pq.avif : 16 x 16, 4 channel, uint10 heif
6060
SHA-1: 0F3CAB52D479BC23E9C981DBADDFEF1F792E5540
6161
channel list: R, G, B, A
6262
CICP: 9, 16, 9, 1
63-
Software: "OpenImageIO 3.2.0.0dev : A50DC799B2B4CA667217608C0F82302455E5D32A"
6463
Exif:ExifVersion: "0230"
6564
Exif:FlashPixVersion: "0100"
66-
Exif:ImageHistory: "oiiotool --pattern fill:topleft=1,0,0,1:topright=0,1,0,1:bottomleft=0,0,1,1:bottomright=1,1,1,1 16x16 4 -d uint16 -o test16.png"
6765
heif:UnassociatedAlpha: 1
6866
oiio:BitsPerSample: 10
6967
oiio:ColorSpace: "srgb_rec709_scene"

testsuite/heif/run.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
command += oiiotool (os.path.join(imagedir, "test-10bit.avif") +
1313
" -d uint10 --cicp \"9,16,9,1\" -o cicp_pq.avif" )
14-
command += info_command ("cicp_pq.avif")
14+
command += info_command ("cicp_pq.avif", safematch=True)
1515

1616
files = [ "greyhounds-looking-for-a-table.heic", "sewing-threads.heic" ]
1717
for f in files:

0 commit comments

Comments
 (0)