summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--external/cairo/UnpackedTarball_pixman.mk1
-rw-r--r--external/cairo/pixman/Wincompatible-function-pointer-types.patch.019
2 files changed, 20 insertions, 0 deletions
diff --git a/external/cairo/UnpackedTarball_pixman.mk b/external/cairo/UnpackedTarball_pixman.mk
index 3f1f75616611..327041a1b141 100644
--- a/external/cairo/UnpackedTarball_pixman.mk
+++ b/external/cairo/UnpackedTarball_pixman.mk
@@ -14,6 +14,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,pixman,$(PIXMAN_TARBALL),,cairo))
$(eval $(call gb_UnpackedTarball_add_patches,pixman,\
external/cairo/pixman/pixman-0.24.4.patch \
external/cairo/pixman/pixman-ubsan.patch \
+ external/cairo/pixman/Wincompatible-function-pointer-types.patch.0 \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/cairo/pixman/Wincompatible-function-pointer-types.patch.0 b/external/cairo/pixman/Wincompatible-function-pointer-types.patch.0
new file mode 100644
index 000000000000..7f43a350af35
--- /dev/null
+++ b/external/cairo/pixman/Wincompatible-function-pointer-types.patch.0
@@ -0,0 +1,19 @@
+--- pixman/pixman-bits-image.c
++++ pixman/pixman-bits-image.c
+@@ -1851,14 +1851,14 @@
+ iter->y++;
+ }
+
+-static const float
++static float
+ dither_factor_blue_noise_64 (int x, int y)
+ {
+ float m = dither_blue_noise_64x64[((y & 0x3f) << 6) | (x & 0x3f)];
+ return m * (1. / 4096.f) + (1. / 8192.f);
+ }
+
+-static const float
++static float
+ dither_factor_bayer_8 (int x, int y)
+ {
+ uint32_t m;