30 May
2001
30 May
'01
6:47 p.m.
Ove Kaaven wrote:
So FT_TRUETYPE_TABLES_H and FT_GLYPH_H is covered, but FT_NAMES_H and FT_TRUETYPE_NAMES_H is not. Apparently the defines were changed or something - FT_SFNT_NAMES_H is apparently the one you must use now?
Let me know if this works.
--
========================================================================
Ian Pilcher ian.pilcher@home.com
========================================================================
diff -urN ../wine-20010529cvs/dlls/wineps/truetype.c ./dlls/wineps/truetype.c
--- ../wine-20010529cvs/dlls/wineps/truetype.c Tue May 29 18:16:33 2001
+++ ./dlls/wineps/truetype.c Wed May 30 13:24:37 2001
@@ -9,11 +9,31 @@
#ifdef HAVE_FREETYPE
+/*
+ * These stupid ifdefs should work for FreeType 2.0.1 and 2.0.2. 2.0.3 and
+ * beyond are anybody's guess.
+ */
+
#include <freetype/freetype.h>
-#include FT_NAMES_H
-#include FT_TRUETYPE_NAMES_H
-#include FT_TRUETYPE_TABLES_H
#include FT_GLYPH_H
+#include FT_TRUETYPE_TABLES_H
+
+#ifdef FT_NAMES_H
+#include FT_NAMES_H /* 2.0.1 */
+#endif
+
+#ifdef FT_SFNT_NAMES_H
+#include FT_SFNT_NAMES_H /* 2.0.2 */
+#endif
+
+#ifdef FT_TRUETYPE_NAMES_H
+#include FT_TRUETYPE_NAMES_H /* 2.0.1 */
+#endif
+
+#ifdef FT_TRUETYPE_IDS_H
+#include FT_TRUETYPE_IDS_H /* 2.0.2 */
+#endif
+
#include <sys/types.h>
#include <dirent.h>
#include <string.h>