Fix COLRv1 for Segoe UI Emoji (#841)
The yx and xy transform components were swapped in the conversion. Also
the repeat/reflect extend modes.
See zulip:
https://xi.zulipchat.com/#narrow/channel/205635-text/topic/Purple.20emoji.20on.20Windows/with/503831553
diff --git a/vello/src/scene.rs b/vello/src/scene.rs
index 6b5d3ee..f01eb23 100644
--- a/vello/src/scene.rs
+++ b/vello/src/scene.rs
@@ -933,7 +933,7 @@
fn conv_skrifa_transform(transform: skrifa::color::Transform) -> Transform {
Transform {
- matrix: [transform.xx, transform.xy, transform.yx, transform.yy],
+ matrix: [transform.xx, transform.yx, transform.xy, transform.yy],
translation: [transform.dx, transform.dy],
}
}
@@ -1013,8 +1013,8 @@
fn conv_extend(extend: skrifa::color::Extend) -> Extend {
match extend {
skrifa::color::Extend::Pad => Extend::Pad,
- skrifa::color::Extend::Repeat => Extend::Reflect,
- skrifa::color::Extend::Reflect => Extend::Repeat,
+ skrifa::color::Extend::Repeat => Extend::Repeat,
+ skrifa::color::Extend::Reflect => Extend::Reflect,
// TODO: Error reporting on unknown variant?
_ => Extend::Pad,
}
diff --git a/vello_tests/snapshots/big_colr.png b/vello_tests/snapshots/big_colr.png
index 8484a06..5f066bb 100644
--- a/vello_tests/snapshots/big_colr.png
+++ b/vello_tests/snapshots/big_colr.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:ab53a8a4e769ba509cc63c4cae01c09a464d0049d05e7fe51830a4533beca136
-size 15750
+oid sha256:89162f768ee75f6c84317ae312578e425633895c03c92822b86cd37c970c926e
+size 16015
diff --git a/vello_tests/snapshots/little_colr.png b/vello_tests/snapshots/little_colr.png
index 69796d0..01cec0f 100644
--- a/vello_tests/snapshots/little_colr.png
+++ b/vello_tests/snapshots/little_colr.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:842fa191cb557818fc3ff5663801d297c22d71eb0eacafbd757a7cadf6aae1c7
-size 1938
+oid sha256:05d069dcd6a872d86f1d988b65458503938f6cb8f30258994bd88a7e1fc4f3ba
+size 1950
