(struct OpenTypeSpec): New struct.

(OTF_SYM_TAG, OTF_TAG_STR): New macros.
(ftfont_get_open_type_spec): New function.
(ftfont_list) [HAVE_LIBOTF]: Check otf-spec property.

1 files changed, 5 insertions, 5 deletions

diff --git a/src/ftfont.c b/src/ftfont.c
index 50ad0f460de..4170a2a892a 100644
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -335,12 +335,12 @@ struct OpenTypeSpec
     tag = (p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3];     \
   } while (0)
 
-#define OTF_TAG_STR(tag, str)                   \
+#define OTF_TAG_STR(tag, p)                     \
   do {                                          \
-    (str)[0] = (char) (tag >> 24);              \
-    (str)[1] = (char) ((tag >> 16) & 0xFF);     \
-    (str)[2] = (char) ((tag >> 8) & 0xFF);      \
-    (str)[3] = (char) (tag & 0xFF);             \
+    (p)[0] = (char) (tag >> 24);                \
+    (p)[1] = (char) ((tag >> 16) & 0xFF);       \
+    (p)[2] = (char) ((tag >> 8) & 0xFF);        \
+    (p)[3] = (char) (tag & 0xFF);               \
   } while (0)
 
 static struct OpenTypeSpec *