Skip to content

Commit c5e0030

Browse files
committed
fix: improve CICP tests
Remove "Software" attribute to avoid baking OIIO-version-specific data into the out.txts Signed-off-by: Zach Lewis <zachcanbereached@gmail.com>
1 parent ea3000a commit c5e0030

3 files changed

Lines changed: 3 additions & 9 deletions

File tree

testsuite/png/ref/out-libpng15.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,18 +93,15 @@ smallalpha.png : 1 x 1, 4 channel, uint8 png
9393
cicp:
9494
16 x 16, 4 channel, float png
9595
channel list: R, G, B, A
96-
Software: "OpenImageIO 3.1.3.0dev : DC4B1085141AF19019744DC43B156DE981E3B465"
9796
oiio:ColorSpace: "sRGB"
9897
modified_cicp:
9998
16 x 16, 4 channel, float png
10099
channel list: R, G, B, A
101100
CICP: 0, 0, 0, 0
102-
Software: "OpenImageIO 3.1.3.0dev : DC4B1085141AF19019744DC43B156DE981E3B465"
103101
oiio:ColorSpace: "sRGB"
104102
removed_cicp:
105103
16 x 16, 4 channel, float png
106104
channel list: R, G, B, A
107-
Software: "OpenImageIO 3.1.3.0dev : DC4B1085141AF19019744DC43B156DE981E3B465"
108105
oiio:ColorSpace: "sRGB"
109106
Comparing "test16.png" and "ref/test16.png"
110107
PASS

testsuite/png/ref/out.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,19 +93,16 @@ smallalpha.png : 1 x 1, 4 channel, uint8 png
9393
cicp:
9494
16 x 16, 4 channel, float png
9595
channel list: R, G, B, A
96-
Software: "OpenImageIO 3.1.3.0dev : DC4B1085141AF19019744DC43B156DE981E3B465"
9796
CICP: 1, 13, 0, 1
9897
oiio:ColorSpace: "sRGB"
9998
modified_cicp:
10099
16 x 16, 4 channel, float png
101100
channel list: R, G, B, A
102-
Software: "OpenImageIO 3.1.3.0dev : DC4B1085141AF19019744DC43B156DE981E3B465"
103101
CICP: 1, 13, 0, 0
104102
oiio:ColorSpace: "sRGB"
105103
removed_cicp:
106104
16 x 16, 4 channel, float png
107105
channel list: R, G, B, A
108-
Software: "OpenImageIO 3.1.3.0dev : DC4B1085141AF19019744DC43B156DE981E3B465"
109106
oiio:ColorSpace: "sRGB"
110107
Comparing "test16.png" and "ref/test16.png"
111108
PASS

testsuite/png/run.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434

3535
# Test embedding CICP metadata in PNG files
3636
command += oiiotool ("-i test16.png --cicp 1,13 -o test16.png")
37-
command += oiiotool ("-echo cicp: test16.png --printinfo")
38-
command += oiiotool ("-echo modified_cicp: test16.png --cicp ,,,0 --printinfo")
39-
command += oiiotool ("-echo removed_cicp: test16.png --cicp '' --printinfo")
37+
command += oiiotool ("-echo cicp: test16.png --eraseattrib Software --printinfo")
38+
command += oiiotool ("-echo modified_cicp: test16.png --eraseattrib Software --cicp ,,,0 --printinfo")
39+
command += oiiotool ("-echo removed_cicp: test16.png --eraseattrib Software --cicp '' --printinfo")
4040

4141
outputs = [ "test16.png", "out.txt" ]
4242

0 commit comments

Comments
 (0)