Werner Lemberg pushed to branch master at FreeType / FreeType
Commits:
-
357b353c
by David Turner at 2021-07-17T08:31:20+02:00
2 changed files:
Changes:
| 1 |
+2021-07-17 David Turner <david@freetype.org>
|
|
| 2 |
+ |
|
| 3 |
+ * src/smooth/ftgrays.c: Fix compilation if `FT_LONG64` is undefined.
|
|
| 4 |
+ |
|
| 5 |
+ The code assumed that if `__SSE2__` is defined, then 64-bit integer
|
|
| 6 |
+ types are available. This is not the case apparently for certain
|
|
| 7 |
+ multilib compiler targets like 'x86_32.x86' used by Gentoo.
|
|
| 8 |
+ |
|
| 9 |
+ This patch fixes the issue by disabling the special code path when
|
|
| 10 |
+ 64-bit integer types are not available.
|
|
| 11 |
+ |
|
| 12 |
+ Fixes #1071.
|
|
| 13 |
+ |
|
| 1 | 14 |
2021-07-16 Alex Richardson <Alexander.Richardson@cl.cam.ac.uk>
|
| 2 | 15 |
|
| 3 | 16 |
[tests] Allow arbitrary build directories.
|
| ... | ... | @@ -10,7 +23,7 @@ |
| 10 | 23 |
|
| 11 | 24 |
* tests/meson.build: Updated.
|
| 12 | 25 |
|
| 13 |
-2021-07-15 Alex Richardson <Alexander.Richardson@cl.cam.ac.uk>
|
|
| 26 |
+2021-07-16 Alex Richardson <Alexander.Richardson@cl.cam.ac.uk>
|
|
| 14 | 27 |
|
| 15 | 28 |
* tests/issue-1063/main.c (main): Fix uninitialized variable.
|
| 16 | 29 |
|
| ... | ... | @@ -1018,6 +1018,16 @@ typedef ptrdiff_t FT_PtrDist; |
| 1018 | 1018 |
# define BEZIER_USE_DDA 0
|
| 1019 | 1019 |
#endif
|
| 1020 | 1020 |
|
| 1021 |
+ /*
|
|
| 1022 |
+ * For now, the code that depends on `BEZIER_USE_DDA` requires `FT_Int64`
|
|
| 1023 |
+ * to be defined. If `FT_LONG64` is not defined, meaning there is no
|
|
| 1024 |
+ * 64-bit type available, disable it to avoid compilation errors. See for
|
|
| 1025 |
+ * example https://gitlab.freedesktop.org/freetype/freetype/-/issues/1071.
|
|
| 1026 |
+ */
|
|
| 1027 |
+#if !defined( FT_LONG64 )
|
|
| 1028 |
+# undef BEZIER_USE_DDA
|
|
| 1029 |
+# define BEZIER_USE_DDA 0
|
|
| 1030 |
+#endif
|
|
| 1021 | 1031 |
|
| 1022 | 1032 |
#if BEZIER_USE_DDA
|
| 1023 | 1033 |
|