Skip to content

Commit 03c2383

Browse files
lgritzlgritz
authored
ci: update ref output to compensate for GitHub windows drive changes (AcademySoftwareFoundation#4761)
Apparently, the runners used to check things out on drive D:, but today they are doing so on C:, and that changes some filenames in the reference output. Also, fix missing nametag needed for Windows artifacts. Signed-off-by: Larry Gritz <lg@larrygritz.com>
1 parent 362a9fb commit 03c2383

File tree

2 files changed

+213
-0
lines changed

2 files changed

+213
-0
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -605,18 +605,21 @@ jobs:
605605
include:
606606
- desc: Windows-2019 VS2019
607607
runner: windows-2019
608+
nametag: windows-2019
608609
vsver: 2019
609610
generator: "Visual Studio 16 2019"
610611
python_ver: "3.9"
611612
setenvs: export OPENIMAGEIO_PYTHON_LOAD_DLLS_FROM_PATH=1
612613
- desc: Windows-2022 VS2022
613614
runner: windows-2022
615+
nametag: windows-2022
614616
vsver: 2022
615617
generator: "Visual Studio 17 2022"
616618
python_ver: "3.9"
617619
setenvs: export OPENIMAGEIO_PYTHON_LOAD_DLLS_FROM_PATH=1
618620
- desc: Windows-2025 VS2022
619621
runner: windows-2025
622+
nametag: windows-2025
620623
vsver: 2022
621624
generator: "Visual Studio 17 2022"
622625
python_ver: "3.9"

‎testsuite/python-imageinput/ref/out-python3-win-2.txt‎

Lines changed: 210 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,210 @@
1+
Could not open "badname.tif"
2+
Error: Could not open file: S: Cannot open
3+
Opened "C:/a/OpenImageIO/OpenImageIO/build/testsuite/oiio-images/tahoe-gps.jpg" as a jpeg
4+
resolution 2048x1536+0+0
5+
untiled
6+
3 channels: ('R', 'G', 'B')
7+
format = uint8
8+
alpha channel = -1
9+
z channel = -1
10+
deep = False
11+
oiio:ColorSpace = "sRGB"
12+
jpeg:subsampling = "4:2:0"
13+
Make = "HTC"
14+
Model = "T-Mobile G1"
15+
Orientation = 1
16+
XResolution = 72.0
17+
YResolution = 72.0
18+
ResolutionUnit = "none"
19+
Software = "title;va"
20+
Exif:YCbCrPositioning = 1
21+
Exif:ExifVersion = "0220"
22+
Exif:DateTimeOriginal = "2009:02:21 08:32:04"
23+
Exif:DateTimeDigitized = "2009:02:21 08:32:04"
24+
Exif:FlashPixVersion = "0100"
25+
Exif:ColorSpace = 1
26+
Exif:PixelXDimension = 2048
27+
Exif:PixelYDimension = 1536
28+
Exif:WhiteBalance = 0
29+
GPS:VersionID = (2, 2, 0, 0)
30+
GPS:LatitudeRef = "N"
31+
GPS:Latitude = (39.0, 18.0, 24.399999618530273)
32+
GPS:LongitudeRef = "W"
33+
GPS:Longitude = (120.0, 20.0, 6.25)
34+
GPS:AltitudeRef = 0
35+
GPS:Altitude = 0.0
36+
GPS:TimeStamp = (17.0, 56.0, 33.0)
37+
GPS:MapDatum = "WGS-84"
38+
GPS:DateStamp = "1915:08:08"
39+
40+
Opened "grid.tx" as a tiff
41+
resolution 1024x1024+0+0
42+
tile size 64x64x1
43+
4 channels: ('R', 'G', 'B', 'A')
44+
format = uint8
45+
alpha channel = 3
46+
z channel = -1
47+
deep = False
48+
oiio:BitsPerSample = 8
49+
Orientation = 1
50+
XResolution = 72.0
51+
YResolution = 72.0
52+
ResolutionUnit = "in"
53+
Software = "OpenImageIO 1.5.7dev : maketx -filter lanczos3 --resize grid.tif -o grid.tx"
54+
DateTime = "2014:11:29 23:20:23"
55+
DocumentName = "g.tif"
56+
textureformat = "Plain Texture"
57+
wrapmodes = "black,black"
58+
fovcot = 1.0
59+
tiff:Compression = 8
60+
tiff:PhotometricInterpretation = 2
61+
tiff:PlanarConfiguration = 1
62+
planarconfig = "contig"
63+
compression = "zip"
64+
PixelAspectRatio = 1.0
65+
oiio:AverageColor = "0.608983,0.608434,0.608728,1"
66+
oiio:SHA-1 = "233A1D3412A54A5F49814AB7BFFD04F56F46D3D7"
67+
Subimage 0 MIP level 1 :
68+
resolution 512x512+0+0
69+
tile size 64x64x1
70+
Subimage 0 MIP level 2 :
71+
resolution 256x256+0+0
72+
tile size 64x64x1
73+
Subimage 0 MIP level 3 :
74+
resolution 128x128+0+0
75+
tile size 64x64x1
76+
Subimage 0 MIP level 4 :
77+
resolution 64x64+0+0
78+
tile size 64x64x1
79+
Subimage 0 MIP level 5 :
80+
resolution 32x32+0+0
81+
tile size 64x64x1
82+
Subimage 0 MIP level 6 :
83+
resolution 16x16+0+0
84+
tile size 64x64x1
85+
Subimage 0 MIP level 7 :
86+
resolution 8x8+0+0
87+
tile size 64x64x1
88+
Subimage 0 MIP level 8 :
89+
resolution 4x4+0+0
90+
tile size 64x64x1
91+
Subimage 0 MIP level 9 :
92+
resolution 2x2+0+0
93+
tile size 64x64x1
94+
Subimage 0 MIP level 10 :
95+
resolution 1x1+0+0
96+
tile size 64x64x1
97+
98+
Testing read_image:
99+
Opened "C:/a/OpenImageIO/OpenImageIO/build/testsuite/oiio-images/tahoe-gps.jpg" as a jpeg
100+
@ (0, 0) = [40 35 57]
101+
@ (2047, 1535) = [37 56 89]
102+
@ (1024, 768) = [137 183 233]
103+
104+
Opened "C:/a/OpenImageIO/OpenImageIO/build/testsuite/oiio-images/tahoe-gps.jpg" as a jpeg
105+
@ (0, 0) = [0.15686275 0.13725491 0.22352943]
106+
@ (2047, 1535) = [0.14509805 0.21960786 0.34901962]
107+
@ (1024, 768) = [0.5372549 0.7176471 0.91372555]
108+
109+
Opened "C:/a/OpenImageIO/OpenImageIO/build/testsuite/oiio-images/tahoe-gps.jpg" as a jpeg
110+
@ (0, 0) = [40]
111+
@ (2047, 1535) = [37]
112+
@ (1024, 768) = [137]
113+
114+
Testing read_scanline:
115+
Opened "C:/a/OpenImageIO/OpenImageIO/build/testsuite/oiio-images/tahoe-gps.jpg" as a jpeg
116+
@ (0, 0) = [40 35 57]
117+
@ (0, 1535) = [ 82 94 136]
118+
119+
Testing read_tile:
120+
Opened "grid.tx" as a tiff
121+
@ (32, 32) = [ 1 1 1 255]
122+
@ (32, 32) = [255 127 127 255]
123+
124+
Testing read_scanlines:
125+
Opened "C:/a/OpenImageIO/OpenImageIO/build/testsuite/oiio-images/tahoe-gps.jpg" as a jpeg
126+
@ (0, 0) = [40 35 57]
127+
@ (2047, 1535) = [37 56 89]
128+
@ (1024, 768) = [137 183 233]
129+
130+
Testing read_tiles:
131+
Opened "grid.tx" as a tiff
132+
@ (0, 0) = [ 0 0 0 255]
133+
@ (1023, 1023) = [ 0 0 0 255]
134+
@ (512, 512) = [ 0 0 0 255]
135+
136+
Test read_image native u16:
137+
Opened "testu16.tif" as a tiff
138+
Read array typecode uint16 [ 12288 ]
139+
140+
Test read_scanlines native u16:
141+
Opened "testu16.tif" as a tiff
142+
Read array typecode uint16 [ 12288 ]
143+
144+
Test read_tiles native half:
145+
Opened "testf16.exr" as a openexr
146+
Read array typecode float16 [ 12288 ]
147+
148+
Test read_image into half:
149+
Opened "testu16.tif" as a tiff
150+
Read array typecode float16 [ 12288 ]
151+
152+
Test read_image into FLOAT:
153+
Opened "testu16.tif" as a tiff
154+
Read array typecode float32 [ 12288 ]
155+
156+
Testing write and read of unassociated:
157+
writing: [[[0.5 0.5 0.5 0.5]
158+
[0.5 0.5 0.5 0.5]]
159+
160+
[[0.5 0.5 0.5 0.5]
161+
[0.5 0.5 0.5 0.5]]]
162+
163+
default reading as IB: [[[0.25 0.25 0.25 0.5 ]
164+
[0.25 0.25 0.25 0.5 ]]
165+
166+
[[0.25 0.25 0.25 0.5 ]
167+
[0.25 0.25 0.25 0.5 ]]]
168+
169+
reading as IB with unassoc hint: [[[0.5 0.5 0.5 0.5]
170+
[0.5 0.5 0.5 0.5]]
171+
172+
[[0.5 0.5 0.5 0.5]
173+
[0.5 0.5 0.5 0.5]]]
174+
175+
reading as II with hint, read scanlines backward:
176+
[1] = [[0.5 0.5 0.5 0.5]
177+
[0.5 0.5 0.5 0.5]]
178+
[0] = [[0.5 0.5 0.5 0.5]
179+
[0.5 0.5 0.5 0.5]]
180+
181+
182+
Testing write and read of TIFF CMYK with auto RGB translation:
183+
writing: [[[0.5019608 0. 0. 0.5019608]
184+
[0.5019608 0. 0. 0.5019608]]
185+
186+
[[0.5019608 0. 0. 0.5019608]
187+
[0.5019608 0. 0. 0.5019608]]]
188+
189+
default reading as IB: [[[0.24705884 0.49803925 0.49803925]
190+
[0.24705884 0.49803925 0.49803925]]
191+
192+
[[0.24705884 0.49803925 0.49803925]
193+
[0.24705884 0.49803925 0.49803925]]]
194+
195+
reading as IB with rawcolor=1: [[[0.5019608 0. 0. 0.5019608]
196+
[0.5019608 0. 0. 0.5019608]]
197+
198+
[[0.5019608 0. 0. 0.5019608]
199+
[0.5019608 0. 0. 0.5019608]]]
200+
201+
reading as II with rawcolor=0, read scanlines backward:
202+
[1] = [[0.24705884 0.49803925 0.49803925]
203+
[0.24705884 0.49803925 0.49803925]]
204+
[0] = [[0.24705884 0.49803925 0.49803925]
205+
[0.24705884 0.49803925 0.49803925]]
206+
207+
208+
is_imageio_format_name('tiff') = True
209+
is_imageio_format_name('txff') = False
210+
Done.

0 commit comments

Comments
 (0)