diff options
| author | YAMAMOTO Mitsuharu | 2019-05-23 10:53:23 +0900 |
|---|---|---|
| committer | YAMAMOTO Mitsuharu | 2019-05-23 10:53:23 +0900 |
| commit | b40dde705af4d53853de6185a2468153b442dc9a (patch) | |
| tree | e8dabba695163c2d07439fad6accff761f8f714c /src/font.h | |
| parent | 5d7dafacf4afc888511649f6fc24c28210cd0dfc (diff) | |
| parent | 03feb9376b54c489e24478954a11061e9b0d6db7 (diff) | |
| download | emacs-b40dde705af4d53853de6185a2468153b442dc9a.tar.gz emacs-b40dde705af4d53853de6185a2468153b442dc9a.zip | |
Merge branch 'master' into harfbuzz
Diffstat (limited to 'src/font.h')
| -rw-r--r-- | src/font.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/font.h b/src/font.h index 1f62a61f0be..a590bda3db4 100644 --- a/src/font.h +++ b/src/font.h | |||
| @@ -651,7 +651,7 @@ struct font_driver | |||
| 651 | the font FONT and the sequence of glyph codes CODE, and store the | 651 | the font FONT and the sequence of glyph codes CODE, and store the |
| 652 | result in METRICS. */ | 652 | result in METRICS. */ |
| 653 | void (*text_extents) (struct font *font, | 653 | void (*text_extents) (struct font *font, |
| 654 | unsigned *code, int nglyphs, | 654 | const unsigned *code, int nglyphs, |
| 655 | struct font_metrics *metrics); | 655 | struct font_metrics *metrics); |
| 656 | 656 | ||
| 657 | #ifdef HAVE_WINDOW_SYSTEM | 657 | #ifdef HAVE_WINDOW_SYSTEM |
| @@ -920,7 +920,7 @@ extern Lisp_Object ftfont_shape (Lisp_Object, Lisp_Object); | |||
| 920 | extern unsigned ftfont_encode_char (struct font *, int); | 920 | extern unsigned ftfont_encode_char (struct font *, int); |
| 921 | extern void ftfont_close (struct font *); | 921 | extern void ftfont_close (struct font *); |
| 922 | extern void ftfont_filter_properties (Lisp_Object, Lisp_Object); | 922 | extern void ftfont_filter_properties (Lisp_Object, Lisp_Object); |
| 923 | extern void ftfont_text_extents (struct font *, unsigned *, int, | 923 | extern void ftfont_text_extents (struct font *, const unsigned *, int, |
| 924 | struct font_metrics *); | 924 | struct font_metrics *); |
| 925 | #ifdef HAVE_HARFBUZZ | 925 | #ifdef HAVE_HARFBUZZ |
| 926 | extern Lisp_Object fthbfont_combining_capability (struct font *); | 926 | extern Lisp_Object fthbfont_combining_capability (struct font *); |