Commit 357b353c2a90a64df20f2531f6e4aacef9fb3e28
2021-07-16T11:12:13
* src/smooth/ftgrays.c: Fix compilation if `FT_LONG64` is undefined. The code assumed that if `__SSE2__` is defined, then 64-bit integer types are available. This is not the case apparently for certain multilib compiler targets like 'x86_32.x86' used by Gentoo. This patch fixes the issue by disabling the special code path when 64-bit integer types are not available. Fixes #1071.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51
diff --git a/ChangeLog b/ChangeLog
index 7a3a465..2aefedd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2021-07-17 David Turner <david@freetype.org>
+
+ * src/smooth/ftgrays.c: Fix compilation if `FT_LONG64` is undefined.
+
+ The code assumed that if `__SSE2__` is defined, then 64-bit integer
+ types are available. This is not the case apparently for certain
+ multilib compiler targets like 'x86_32.x86' used by Gentoo.
+
+ This patch fixes the issue by disabling the special code path when
+ 64-bit integer types are not available.
+
+ Fixes #1071.
+
2021-07-16 Alex Richardson <Alexander.Richardson@cl.cam.ac.uk>
[tests] Allow arbitrary build directories.
@@ -10,7 +23,7 @@
* tests/meson.build: Updated.
-2021-07-15 Alex Richardson <Alexander.Richardson@cl.cam.ac.uk>
+2021-07-16 Alex Richardson <Alexander.Richardson@cl.cam.ac.uk>
* tests/issue-1063/main.c (main): Fix uninitialized variable.
diff --git a/src/smooth/ftgrays.c b/src/smooth/ftgrays.c
index e5f36a0..86118fb 100644
--- a/src/smooth/ftgrays.c
+++ b/src/smooth/ftgrays.c
@@ -1018,6 +1018,16 @@ typedef ptrdiff_t FT_PtrDist;
# define BEZIER_USE_DDA 0
#endif
+ /*
+ * For now, the code that depends on `BEZIER_USE_DDA` requires `FT_Int64`
+ * to be defined. If `FT_LONG64` is not defined, meaning there is no
+ * 64-bit type available, disable it to avoid compilation errors. See for
+ * example https://gitlab.freedesktop.org/freetype/freetype/-/issues/1071.
+ */
+#if !defined( FT_LONG64 )
+# undef BEZIER_USE_DDA
+# define BEZIER_USE_DDA 0
+#endif
#if BEZIER_USE_DDA