tests: Update expected results

These were changed by fixes for glyph transforms.
This commit is contained in:
Matthias Clasen 2022-12-23 00:01:20 -05:00 committed by Behdad Esfahbod
parent 3993a40703
commit ee7bbdf372
14 changed files with 254 additions and 228 deletions

View File

@ -2,6 +2,7 @@ start transform 0.019531 0.000000 0.000000 0.019531 0.000000 0.000000
push group push group
start transform 51.200001 0.000000 -0.000000 51.200001 0.000000 0.000000 start transform 51.200001 0.000000 -0.000000 51.200001 0.000000 0.000000
start clip glyph 13 start clip glyph 13
start transform 0.019531 0.000000 0.000000 0.019531 0.000000 0.000000
start transform 1.000000 0.000000 0.000000 0.976807 0.000000 0.000000 start transform 1.000000 0.000000 0.000000 0.976807 0.000000 0.000000
radial gradient radial gradient
p0 280.000000 440.000000 radius 0.000000 p0 280.000000 440.000000 radius 0.000000
@ -12,12 +13,14 @@ start transform 0.019531 0.000000 0.000000 0.019531 0.000000 0.000000
0.808594 173 130 100 255 0.808594 173 130 100 255
1.000000 164 123 98 255 1.000000 164 123 98 255
end transform end transform
end transform
end clip end clip
end transform end transform
pop group mode 3 pop group mode 3
push group push group
start transform 51.200001 0.000000 -0.000000 51.200001 0.000000 0.000000 start transform 51.200001 0.000000 -0.000000 51.200001 0.000000 0.000000
start clip glyph 14 start clip glyph 14
start transform 0.019531 0.000000 0.000000 0.019531 0.000000 0.000000
linear gradient linear gradient
p0 231.000000 -27.000000 p0 231.000000 -27.000000
p1 1019.000000 -27.000000 p1 1019.000000 -27.000000
@ -25,27 +28,34 @@ start transform 0.019531 0.000000 0.000000 0.019531 0.000000 0.000000
colors colors
0.000000 164 123 98 255 0.000000 164 123 98 255
1.000000 164 123 98 255 1.000000 164 123 98 255
end transform
end clip end clip
end transform end transform
pop group mode 3 pop group mode 3
push group push group
start transform 51.200001 0.000000 -0.000000 51.200001 0.000000 0.000000 start transform 51.200001 0.000000 -0.000000 51.200001 0.000000 0.000000
start clip glyph 15 start clip glyph 15
start transform 0.019531 0.000000 0.000000 0.019531 0.000000 0.000000
solid 145 103 77 255 solid 145 103 77 255
end transform
end clip end clip
end transform end transform
pop group mode 3 pop group mode 3
push group push group
start transform 51.200001 0.000000 -0.000000 51.200001 0.000000 0.000000 start transform 51.200001 0.000000 -0.000000 51.200001 0.000000 0.000000
start clip glyph 16 start clip glyph 16
start transform 0.019531 0.000000 0.000000 0.019531 0.000000 0.000000
solid 30 136 229 255 solid 30 136 229 255
end transform
end clip end clip
end transform end transform
pop group mode 3 pop group mode 3
push group push group
start transform 51.200001 0.000000 -0.000000 51.200001 0.000000 0.000000 start transform 51.200001 0.000000 -0.000000 51.200001 0.000000 0.000000
start clip glyph 21 start clip glyph 21
start transform 0.019531 0.000000 0.000000 0.019531 0.000000 0.000000
solid 145 103 77 255 solid 145 103 77 255
end transform
end clip end clip
end transform end transform
pop group mode 3 pop group mode 3
@ -53,6 +63,7 @@ start transform 0.019531 0.000000 0.000000 0.019531 0.000000 0.000000
push group push group
start transform 51.200001 0.000000 -0.000000 51.200001 0.000000 0.000000 start transform 51.200001 0.000000 -0.000000 51.200001 0.000000 0.000000
start clip glyph 16 start clip glyph 16
start transform 0.019531 0.000000 0.000000 0.019531 0.000000 0.000000
linear gradient linear gradient
p0 669.000000 776.000000 p0 669.000000 776.000000
p1 180.000000 -106.000000 p1 180.000000 -106.000000
@ -60,13 +71,16 @@ start transform 0.019531 0.000000 0.000000 0.019531 0.000000 0.000000
colors colors
0.000000 100 181 246 255 0.000000 100 181 246 255
1.000000 33 150 243 255 1.000000 33 150 243 255
end transform
end clip end clip
end transform end transform
pop group mode 3 pop group mode 3
push group push group
start transform 51.200001 0.000000 -0.000000 51.200001 0.000000 0.000000 start transform 51.200001 0.000000 -0.000000 51.200001 0.000000 0.000000
start clip glyph 18 start clip glyph 18
start transform 0.019531 0.000000 0.000000 0.019531 0.000000 0.000000
solid 66 66 66 51 solid 66 66 66 51
end transform
end clip end clip
end transform end transform
pop group mode 3 pop group mode 3
@ -74,6 +88,7 @@ start transform 0.019531 0.000000 0.000000 0.019531 0.000000 0.000000
push group push group
start transform 51.200001 0.000000 -0.000000 51.200001 0.000000 0.000000 start transform 51.200001 0.000000 -0.000000 51.200001 0.000000 0.000000
start clip glyph 19 start clip glyph 19
start transform 0.019531 0.000000 0.000000 0.019531 0.000000 0.000000
start transform 1.000000 0.000000 0.000000 0.969116 0.000000 0.000000 start transform 1.000000 0.000000 0.000000 0.969116 0.000000 0.000000
radial gradient radial gradient
p0 588.000000 198.000000 radius 0.000000 p0 588.000000 198.000000 radius 0.000000
@ -84,13 +99,16 @@ start transform 0.019531 0.000000 0.000000 0.019531 0.000000 0.000000
0.808594 173 130 100 255 0.808594 173 130 100 255
1.000000 164 123 98 255 1.000000 164 123 98 255
end transform end transform
end transform
end clip end clip
end transform end transform
pop group mode 3 pop group mode 3
push group push group
start transform 51.200001 0.000000 -0.000000 51.200001 0.000000 0.000000 start transform 51.200001 0.000000 -0.000000 51.200001 0.000000 0.000000
start clip glyph 20 start clip glyph 20
start transform 0.019531 0.000000 0.000000 0.019531 0.000000 0.000000
solid 145 103 77 255 solid 145 103 77 255
end transform
end clip end clip
end transform end transform
pop group mode 3 pop group mode 3

View File

@ -2,6 +2,7 @@ start transform 0.019531 0.000000 0.003906 0.019531 0.000000 0.000000
push group push group
start transform 51.200001 0.000000 -10.240000 51.200001 0.000000 0.000000 start transform 51.200001 0.000000 -10.240000 51.200001 0.000000 0.000000
start clip glyph 13 start clip glyph 13
start transform 0.019531 0.000000 0.003906 0.019531 0.000000 0.000000
start transform 1.000000 0.000000 0.000000 0.976807 0.000000 0.000000 start transform 1.000000 0.000000 0.000000 0.976807 0.000000 0.000000
radial gradient radial gradient
p0 280.000000 440.000000 radius 0.000000 p0 280.000000 440.000000 radius 0.000000
@ -12,12 +13,14 @@ start transform 0.019531 0.000000 0.003906 0.019531 0.000000 0.000000
0.808594 173 130 100 255 0.808594 173 130 100 255
1.000000 164 123 98 255 1.000000 164 123 98 255
end transform end transform
end transform
end clip end clip
end transform end transform
pop group mode 3 pop group mode 3
push group push group
start transform 51.200001 0.000000 -10.240000 51.200001 0.000000 0.000000 start transform 51.200001 0.000000 -10.240000 51.200001 0.000000 0.000000
start clip glyph 14 start clip glyph 14
start transform 0.019531 0.000000 0.003906 0.019531 0.000000 0.000000
linear gradient linear gradient
p0 231.000000 -27.000000 p0 231.000000 -27.000000
p1 1019.000000 -27.000000 p1 1019.000000 -27.000000
@ -25,27 +28,34 @@ start transform 0.019531 0.000000 0.003906 0.019531 0.000000 0.000000
colors colors
0.000000 164 123 98 255 0.000000 164 123 98 255
1.000000 164 123 98 255 1.000000 164 123 98 255
end transform
end clip end clip
end transform end transform
pop group mode 3 pop group mode 3
push group push group
start transform 51.200001 0.000000 -10.240000 51.200001 0.000000 0.000000 start transform 51.200001 0.000000 -10.240000 51.200001 0.000000 0.000000
start clip glyph 15 start clip glyph 15
start transform 0.019531 0.000000 0.003906 0.019531 0.000000 0.000000
solid 145 103 77 255 solid 145 103 77 255
end transform
end clip end clip
end transform end transform
pop group mode 3 pop group mode 3
push group push group
start transform 51.200001 0.000000 -10.240000 51.200001 0.000000 0.000000 start transform 51.200001 0.000000 -10.240000 51.200001 0.000000 0.000000
start clip glyph 16 start clip glyph 16
start transform 0.019531 0.000000 0.003906 0.019531 0.000000 0.000000
solid 30 136 229 255 solid 30 136 229 255
end transform
end clip end clip
end transform end transform
pop group mode 3 pop group mode 3
push group push group
start transform 51.200001 0.000000 -10.240000 51.200001 0.000000 0.000000 start transform 51.200001 0.000000 -10.240000 51.200001 0.000000 0.000000
start clip glyph 21 start clip glyph 21
start transform 0.019531 0.000000 0.003906 0.019531 0.000000 0.000000
solid 145 103 77 255 solid 145 103 77 255
end transform
end clip end clip
end transform end transform
pop group mode 3 pop group mode 3
@ -53,6 +63,7 @@ start transform 0.019531 0.000000 0.003906 0.019531 0.000000 0.000000
push group push group
start transform 51.200001 0.000000 -10.240000 51.200001 0.000000 0.000000 start transform 51.200001 0.000000 -10.240000 51.200001 0.000000 0.000000
start clip glyph 16 start clip glyph 16
start transform 0.019531 0.000000 0.003906 0.019531 0.000000 0.000000
linear gradient linear gradient
p0 669.000000 776.000000 p0 669.000000 776.000000
p1 180.000000 -106.000000 p1 180.000000 -106.000000
@ -60,13 +71,16 @@ start transform 0.019531 0.000000 0.003906 0.019531 0.000000 0.000000
colors colors
0.000000 100 181 246 255 0.000000 100 181 246 255
1.000000 33 150 243 255 1.000000 33 150 243 255
end transform
end clip end clip
end transform end transform
pop group mode 3 pop group mode 3
push group push group
start transform 51.200001 0.000000 -10.240000 51.200001 0.000000 0.000000 start transform 51.200001 0.000000 -10.240000 51.200001 0.000000 0.000000
start clip glyph 18 start clip glyph 18
start transform 0.019531 0.000000 0.003906 0.019531 0.000000 0.000000
solid 66 66 66 51 solid 66 66 66 51
end transform
end clip end clip
end transform end transform
pop group mode 3 pop group mode 3
@ -74,6 +88,7 @@ start transform 0.019531 0.000000 0.003906 0.019531 0.000000 0.000000
push group push group
start transform 51.200001 0.000000 -10.240000 51.200001 0.000000 0.000000 start transform 51.200001 0.000000 -10.240000 51.200001 0.000000 0.000000
start clip glyph 19 start clip glyph 19
start transform 0.019531 0.000000 0.003906 0.019531 0.000000 0.000000
start transform 1.000000 0.000000 0.000000 0.969116 0.000000 0.000000 start transform 1.000000 0.000000 0.000000 0.969116 0.000000 0.000000
radial gradient radial gradient
p0 588.000000 198.000000 radius 0.000000 p0 588.000000 198.000000 radius 0.000000
@ -84,13 +99,16 @@ start transform 0.019531 0.000000 0.003906 0.019531 0.000000 0.000000
0.808594 173 130 100 255 0.808594 173 130 100 255
1.000000 164 123 98 255 1.000000 164 123 98 255
end transform end transform
end transform
end clip end clip
end transform end transform
pop group mode 3 pop group mode 3
push group push group
start transform 51.200001 0.000000 -10.240000 51.200001 0.000000 0.000000 start transform 51.200001 0.000000 -10.240000 51.200001 0.000000 0.000000
start clip glyph 20 start clip glyph 20
start transform 0.019531 0.000000 0.003906 0.019531 0.000000 0.000000
solid 145 103 77 255 solid 145 103 77 255
end transform
end clip end clip
end transform end transform
pop group mode 3 pop group mode 3

View File

@ -1,12 +0,0 @@
start clip glyph 12
solid 81 61 50 255
end clip
start clip glyph 13
solid 245 185 68 255
end clip
start clip glyph 14
solid 224 142 55 255
end clip
start clip glyph 15
solid 245 202 86 255
end clip

View File

@ -1,12 +0,0 @@
start clip glyph 16
solid 81 61 50 255
end clip
start clip glyph 17
solid 245 185 68 255
end clip
start clip glyph 18
solid 224 142 55 255
end clip
start clip glyph 19
solid 245 202 86 255
end clip

View File

@ -1,12 +0,0 @@
start clip glyph 8
solid 81 61 50 255
end clip
start clip glyph 9
solid 245 185 68 255
end clip
start clip glyph 10
solid 224 142 55 255
end clip
start clip glyph 11
solid 245 202 86 255
end clip

View File

@ -1,6 +1,7 @@
start transform 0.020000 0.000000 0.000000 0.020000 0.000000 0.000000 start transform 0.020000 0.000000 0.000000 0.020000 0.000000 0.000000
start transform 50.000000 0.000000 -0.000000 50.000000 0.000000 0.000000 start transform 50.000000 0.000000 -0.000000 50.000000 0.000000 0.000000
start clip glyph 174 start clip glyph 174
start transform 0.020000 0.000000 0.000000 0.020000 0.000000 0.000000
sweep gradient sweep gradient
center 500.000000 600.000000 center 500.000000 600.000000
angles 0.000000 6.283185 angles 0.000000 6.283185
@ -9,6 +10,7 @@ start transform 0.020000 0.000000 0.000000 0.020000 0.000000 0.000000
0.416687 0 0 255 255 0.416687 0 0 255 255
0.583313 255 0 0 255 0.583313 255 0 0 255
0.750000 47 79 79 255 0.750000 47 79 79 255
end transform
end clip end clip
end transform end transform
end transform end transform

View File

@ -2,7 +2,9 @@ start transform 0.020000 0.000000 0.000000 0.020000 0.000000 0.000000
push group push group
start transform 50.000000 0.000000 -0.000000 50.000000 0.000000 0.000000 start transform 50.000000 0.000000 -0.000000 50.000000 0.000000 0.000000
start clip glyph 3 start clip glyph 3
start transform 0.020000 0.000000 0.000000 0.020000 0.000000 0.000000
solid 0 0 255 127 solid 0 0 255 127
end transform
end clip end clip
end transform end transform
push group push group
@ -11,7 +13,9 @@ start transform 0.020000 0.000000 0.000000 0.020000 0.000000 0.000000
start transform 0.000000 0.000000 0.000000 0.000000 -1000.000000 -1000.000000 start transform 0.000000 0.000000 0.000000 0.000000 -1000.000000 -1000.000000
start transform 50.000000 0.000000 -0.000000 50.000000 0.000000 0.000000 start transform 50.000000 0.000000 -0.000000 50.000000 0.000000 0.000000
start clip glyph 3 start clip glyph 3
start transform 0.020000 0.000000 0.000000 0.020000 0.000000 0.000000
solid 255 165 0 178 solid 255 165 0 178
end transform
end clip end clip
end transform end transform
end transform end transform

View File

@ -2,14 +2,18 @@ start transform 0.020000 0.000000 0.000000 0.020000 0.000000 0.000000
push group push group
start transform 50.000000 0.000000 -0.000000 50.000000 0.000000 0.000000 start transform 50.000000 0.000000 -0.000000 50.000000 0.000000 0.000000
start clip glyph 3 start clip glyph 3
start transform 0.020000 0.000000 0.000000 0.020000 0.000000 0.000000
solid 0 0 255 127 solid 0 0 255 127
end transform
end clip end clip
end transform end transform
push group push group
start transform 1.000000 0.000000 0.000000 1.000000 200.000000 200.000000 start transform 1.000000 0.000000 0.000000 1.000000 200.000000 200.000000
start transform 50.000000 0.000000 -0.000000 50.000000 0.000000 0.000000 start transform 50.000000 0.000000 -0.000000 50.000000 0.000000 0.000000
start clip glyph 3 start clip glyph 3
start transform 0.020000 0.000000 0.000000 0.020000 0.000000 0.000000
solid 255 165 0 178 solid 255 165 0 178
end transform
end clip end clip
end transform end transform
end transform end transform

View File

@ -2,7 +2,9 @@ start transform 0.020000 0.000000 0.000000 0.020000 0.000000 0.000000
push group push group
start transform 50.000000 0.000000 -0.000000 50.000000 0.000000 0.000000 start transform 50.000000 0.000000 -0.000000 50.000000 0.000000 0.000000
start clip glyph 3 start clip glyph 3
start transform 0.020000 0.000000 0.000000 0.020000 0.000000 0.000000
solid 0 0 0 255 solid 0 0 0 255
end transform
end clip end clip
end transform end transform
pop group mode 3 pop group mode 3
@ -13,7 +15,9 @@ start transform 0.020000 0.000000 0.000000 0.020000 0.000000 0.000000
start transform 0.000000 0.000000 0.000000 0.000000 -333.000000 -667.000000 start transform 0.000000 0.000000 0.000000 0.000000 -333.000000 -667.000000
start transform 50.000000 0.000000 -0.000000 50.000000 0.000000 0.000000 start transform 50.000000 0.000000 -0.000000 50.000000 0.000000 0.000000
start clip glyph 2 start clip glyph 2
start transform 0.020000 0.000000 0.000000 0.020000 0.000000 0.000000
solid 255 220 1 255 solid 255 220 1 255
end transform
end clip end clip
end transform end transform
end transform end transform
@ -25,7 +29,9 @@ start transform 0.020000 0.000000 0.000000 0.020000 0.000000 0.000000
start transform 0.000000 0.000000 0.000000 0.000000 -667.000000 -333.000000 start transform 0.000000 0.000000 0.000000 0.000000 -667.000000 -333.000000
start transform 50.000000 0.000000 -0.000000 50.000000 0.000000 0.000000 start transform 50.000000 0.000000 -0.000000 50.000000 0.000000 0.000000
start clip glyph 2 start clip glyph 2
start transform 0.020000 0.000000 0.000000 0.020000 0.000000 0.000000
solid 104 199 232 255 solid 104 199 232 255
end transform
end clip end clip
end transform end transform
end transform end transform

View File

@ -1,6 +1,7 @@
start transform 0.020000 0.000000 0.000000 0.020000 0.000000 0.000000 start transform 0.020000 0.000000 0.000000 0.020000 0.000000 0.000000
start transform 50.000000 0.000000 -0.000000 50.000000 0.000000 0.000000 start transform 50.000000 0.000000 -0.000000 50.000000 0.000000 0.000000
start clip glyph 165 start clip glyph 165
start transform 0.020000 0.000000 0.000000 0.020000 0.000000 0.000000
linear gradient linear gradient
p0 100.000000 950.000000 p0 100.000000 950.000000
p1 2300.000000 950.000000 p1 2300.000000 950.000000
@ -9,6 +10,7 @@ start transform 0.020000 0.000000 0.000000 0.020000 0.000000 0.000000
0.000000 255 0 0 255 0.000000 255 0 0 255
0.500000 0 0 255 255 0.500000 0 0 255 255
1.000000 255 255 0 255 1.000000 255 255 0 255
end transform
end clip end clip
end transform end transform
end transform end transform

View File

@ -3,7 +3,9 @@ start transform 0.020000 0.000000 0.000000 0.020000 0.000000 0.000000
start transform 1.000000 0.000000 0.000000 1.000000 150.000000 0.000000 start transform 1.000000 0.000000 0.000000 1.000000 150.000000 0.000000
start transform 50.000000 0.000000 -0.000000 50.000000 0.000000 0.000000 start transform 50.000000 0.000000 -0.000000 50.000000 0.000000 0.000000
start clip glyph 174 start clip glyph 174
start transform 0.020000 0.000000 0.000000 0.020000 0.000000 0.000000
solid 0 128 0 255 solid 0 128 0 255
end transform
end clip end clip
end transform end transform
end transform end transform
@ -12,6 +14,7 @@ start transform 0.020000 0.000000 0.000000 0.020000 0.000000 0.000000
start transform 1.000000 0.000000 0.000000 1.000000 -150.000000 0.000000 start transform 1.000000 0.000000 0.000000 1.000000 -150.000000 0.000000
start transform 50.000000 0.000000 -0.000000 50.000000 0.000000 0.000000 start transform 50.000000 0.000000 -0.000000 50.000000 0.000000 0.000000
start clip glyph 174 start clip glyph 174
start transform 0.020000 0.000000 0.000000 0.020000 0.000000 0.000000
linear gradient linear gradient
p0 500.000000 250.000000 p0 500.000000 250.000000
p1 500.000000 950.000000 p1 500.000000 950.000000
@ -19,6 +22,7 @@ start transform 0.020000 0.000000 0.000000 0.020000 0.000000 0.000000
colors colors
0.000000 255 0 0 255 0.000000 255 0 0 255
1.000000 0 0 255 255 1.000000 0 0 255 255
end transform
end clip end clip
end transform end transform
end transform end transform

View File

@ -1,6 +1,7 @@
start transform 0.020000 0.000000 0.000000 0.020000 0.000000 0.000000 start transform 0.020000 0.000000 0.000000 0.020000 0.000000 0.000000
start transform 50.000000 0.000000 -0.000000 50.000000 0.000000 0.000000 start transform 50.000000 0.000000 -0.000000 50.000000 0.000000 0.000000
start clip glyph 6 start clip glyph 6
start transform 0.020000 0.000000 0.000000 0.020000 0.000000 0.000000
linear gradient linear gradient
p0 100.000000 250.000000 p0 100.000000 250.000000
p1 900.000000 250.000000 p1 900.000000 250.000000
@ -8,6 +9,7 @@ start transform 0.020000 0.000000 0.000000 0.020000 0.000000 0.000000
colors colors
0.000000 255 0 0 255 0.000000 255 0 0 255
1.000000 0 0 255 255 1.000000 0 0 255 255
end transform
end clip end clip
end transform end transform
end transform end transform

View File

@ -1,6 +1,7 @@
start transform 0.020000 0.000000 0.000000 0.020000 0.000000 0.000000 start transform 0.020000 0.000000 0.000000 0.020000 0.000000 0.000000
start transform 50.000000 0.000000 -0.000000 50.000000 0.000000 0.000000 start transform 50.000000 0.000000 -0.000000 50.000000 0.000000 0.000000
start clip glyph 2 start clip glyph 2
start transform 0.020000 0.000000 0.000000 0.020000 0.000000 0.000000
radial gradient radial gradient
p0 166.000000 768.000000 radius 0.000000 p0 166.000000 768.000000 radius 0.000000
p1 166.000000 768.000000 radius 256.000000 p1 166.000000 768.000000 radius 256.000000
@ -8,6 +9,7 @@ start transform 0.020000 0.000000 0.000000 0.020000 0.000000 0.000000
0.000000 0 128 0 255 0.000000 0 128 0 255
0.500000 255 255 255 255 0.500000 255 255 255 255
1.000000 255 0 0 255 1.000000 255 0 0 255
end transform
end clip end clip
end transform end transform
end transform end transform

View File

@ -711,9 +711,9 @@ static colrv1_test_t colrv1_tests[] = {
{ TEST_GLYPHS, 20, 0, 165, 0, "test-20-0-165" }, { TEST_GLYPHS, 20, 0, 165, 0, "test-20-0-165" },
{ TEST_GLYPHS, 20, 0, 175, 0, "test-20-0-175" }, { TEST_GLYPHS, 20, 0, 175, 0, "test-20-0-175" },
/* COLRv0 */ /* COLRv0 */
{ ROCHER_ABC, 120, 0.3, 1, 0, "rocher-20-0.3-1" }, // A { ROCHER_ABC, 120, 0.3, 1, 0, "rocher-120-0.3-1" }, // A
{ ROCHER_ABC, 120, 0.3, 2, 2, "rocher-20-0-2" }, // B { ROCHER_ABC, 120, 0.3, 2, 2, "rocher-120-0.3-2" }, // B
{ ROCHER_ABC, 120, 0, 3, 200, "rocher-20-0-3" }, // C { ROCHER_ABC, 120, 0, 3, 200, "rocher-120-0-3" }, // C
}; };
static void static void