diff options
| author | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 2019-04-27 18:33:39 +0900 |
|---|---|---|
| committer | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 2019-04-27 18:33:39 +0900 |
| commit | 886bedb36c7b959b7e6fc8ce8e0c04e144b0ae28 (patch) | |
| tree | b5770d9fc10a704ad8aeb3474c6940121252c770 /src/ftfont.h | |
| parent | 015a6e1df2772bd43680df5cbeaffccf98a881da (diff) | |
| parent | 8dc00b2f1e6523c634df3e24379afbe712a32b27 (diff) | |
| download | emacs-886bedb36c7b959b7e6fc8ce8e0c04e144b0ae28.tar.gz | |
Merge branch 'master' into harfbuzz
Diffstat (limited to 'src/ftfont.h')
| -rw-r--r-- | src/ftfont.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/ftfont.h b/src/ftfont.h index 3bbcbfb5d70..f877860895e 100644 --- a/src/ftfont.h +++ b/src/ftfont.h @@ -59,13 +59,17 @@ struct font_info #endif /* HAVE_LIBOTF */ FT_Size ft_size; int index; + /* Index of the bitmap strike used as a fallback for + FT_Set_Pixel_Sizes failure. If the value is non-negative, then + ft_size is not of the requested size. Otherwise it is -1. */ + FT_Int bitmap_strike_index; FT_Matrix matrix; #ifdef HAVE_HARFBUZZ hb_font_t *hb_font; #endif /* HAVE_HARFBUZZ */ #ifdef USE_CAIRO - cairo_font_face_t *cr_font_face; + cairo_scaled_font_t *cr_scaled_font; /* To prevent cairo from cluttering the activated FT_Size maintained in ftfont.c, we activate this special FT_Size before drawing. */ FT_Size ft_size_draw; |