From cf385d93cc9c689763b187e69f38e556b490542b Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Thu, 26 Apr 2007 00:37:14 +0000 Subject: [PATCH] (check_otf_features): Define it regardless of HAVE_LIBOTF. --- src/font.c | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/src/font.c b/src/font.c index 1eedbe04bbc..db11387b2f4 100644 --- a/src/font.c +++ b/src/font.c @@ -1480,6 +1480,33 @@ check_gstring (gstring) /* OTF handler */ +static void +check_otf_features (otf_features) + Lisp_Object otf_features; +{ + Lisp_Object val, elt; + + CHECK_CONS (otf_features); + CHECK_SYMBOL (XCAR (otf_features)); + otf_features = XCDR (otf_features); + CHECK_CONS (otf_features); + CHECK_SYMBOL (XCAR (otf_features)); + otf_features = XCDR (otf_features); + for (val = Fcar (otf_features); ! NILP (val); val = Fcdr (val)) + { + CHECK_SYMBOL (Fcar (val)); + if (SBYTES (SYMBOL_NAME (XCAR (val))) > 4) + error ("Invalid OTF GSUB feature: %s", SYMBOL_NAME (XCAR (val))); + } + otf_features = XCDR (otf_features); + for (val = Fcar (otf_features); ! NILP (val); val = Fcdr (val)) + { + CHECK_SYMBOL (Fcar (val)); + if (SBYTES (SYMBOL_NAME (XCAR (val))) > 4) + error ("Invalid OTF GPOS feature: %s", SYMBOL_NAME (XCAR (val))); + } +} + #ifdef HAVE_LIBOTF #include @@ -1657,33 +1684,6 @@ adjust_anchor (struct font *font, OTF_Anchor *anchor, } } -static void -check_otf_features (otf_features) - Lisp_Object otf_features; -{ - Lisp_Object val, elt; - - CHECK_CONS (otf_features); - CHECK_SYMBOL (XCAR (otf_features)); - otf_features = XCDR (otf_features); - CHECK_CONS (otf_features); - CHECK_SYMBOL (XCAR (otf_features)); - otf_features = XCDR (otf_features); - for (val = Fcar (otf_features); ! NILP (val); val = Fcdr (val)) - { - CHECK_SYMBOL (Fcar (val)); - if (SBYTES (SYMBOL_NAME (XCAR (val))) > 4) - error ("Invalid OTF GSUB feature: %s", SYMBOL_NAME (XCAR (val))); - } - otf_features = XCDR (otf_features); - for (val = Fcar (otf_features); ! NILP (val); val = Fcdr (val)) - { - CHECK_SYMBOL (Fcar (val)); - if (SBYTES (SYMBOL_NAME (XCAR (val))) > 4) - error ("Invalid OTF GPOS feature: %s", SYMBOL_NAME (XCAR (val))); - } -} - Lisp_Object font_otf_DeviceTable (device_table) OTF_DeviceTable *device_table; -- 2.39.5