diff options
| author | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 2019-06-02 13:33:43 +0900 |
|---|---|---|
| committer | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 2019-06-02 13:33:43 +0900 |
| commit | 295572c6f603c7150f68f3a7479fb0969b2f86d0 (patch) | |
| tree | be63752fccbd05d7863fe7329e717da77d3f803f /src/ftcrfont.c | |
| parent | 2ae0c7a434dcdcc53e2ccfc758093714b0695c3b (diff) | |
| download | emacs-295572c6f603c7150f68f3a7479fb0969b2f86d0.tar.gz | |
Implement the get_variation_glyphs method for FreeType >= 2.3.6
* configure.ac: Check availability of FT_Face_GetCharVariantIndex.
* src/ftfont.c (ftfont_variation_glyphs) [HAVE_FT_FACE_GETCHARVARIANTINDEX]:
Add function implementation.
* src/ftcrfont.c (ftcrfont_variation_glyphs)
[HAVE_FT_FACE_GETCHARVARIANTINDEX]: Use function implementation for
HAVE_OTF_GET_VARIATION_GLYPHS.
* src/ftfont.c (ftfont_driver) [HAVE_FT_FACE_GETCHARVARIANTINDEX]:
* src/xftfont.c (xftfont_driver) [HAVE_FT_FACE_GETCHARVARIANTINDEX]:
* src/ftxfont.c (ftxfont_driver) [HAVE_FT_FACE_GETCHARVARIANTINDEX]:
* src/ftcrfont.c (ftcrfont_driver) [HAVE_FT_FACE_GETCHARVARIANTINDEX]:
Populate the get_variation_glyphs method.
Diffstat (limited to 'src/ftcrfont.c')
| -rw-r--r-- | src/ftcrfont.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ftcrfont.c b/src/ftcrfont.c index 0c3b74ff289..1c28a7ceb67 100644 --- a/src/ftcrfont.c +++ b/src/ftcrfont.c @@ -455,7 +455,7 @@ ftcrfont_shape (Lisp_Object lgstring, Lisp_Object direction) } #endif -#ifdef HAVE_OTF_GET_VARIATION_GLYPHS +#if defined HAVE_OTF_GET_VARIATION_GLYPHS || defined HAVE_FT_FACE_GETCHARVARIANTINDEX static int ftcrfont_variation_glyphs (struct font *font, int c, unsigned variations[256]) { @@ -470,7 +470,7 @@ ftcrfont_variation_glyphs (struct font *font, int c, unsigned variations[256]) return result; } -#endif /* HAVE_OTF_GET_VARIATION_GLYPHS */ +#endif /* HAVE_OTF_GET_VARIATION_GLYPHS || HAVE_FT_FACE_GETCHARVARIANTINDEX */ static int ftcrfont_draw (struct glyph_string *s, @@ -583,7 +583,7 @@ struct font_driver const ftcrfont_driver = #if defined HAVE_M17N_FLT && defined HAVE_LIBOTF .shape = ftcrfont_shape, #endif -#ifdef HAVE_OTF_GET_VARIATION_GLYPHS +#if defined HAVE_OTF_GET_VARIATION_GLYPHS || defined HAVE_FT_FACE_GETCHARVARIANTINDEX .get_variation_glyphs = ftcrfont_variation_glyphs, #endif .filter_properties = ftfont_filter_properties, |