From: Kenichi Handa <handa@m17n.org>
Date: Wed, 5 Dec 2007 12:03:13 +0000 (+0000)
Subject: (struct OpenTypeSpec): New struct.
X-Git-Tag: emacs-pretest-23.0.90~8295^2~178
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f192035123f874808a791718fca44d7100d5fcad;p=emacs.git

(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.
---

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 *