diff options
| author | Kenichi Handa | 2007-12-03 01:42:01 +0000 |
|---|---|---|
| committer | Kenichi Handa | 2007-12-03 01:42:01 +0000 |
| commit | 0d674a059d7b1366697cbc621c9a9b77f1d5b359 (patch) | |
| tree | c917cf399c6595777eef959a4e3ad796c77e2eb5 /src | |
| parent | 8f9380d7edb047f1c833090eb13a45efb01de551 (diff) | |
| download | emacs-0d674a059d7b1366697cbc621c9a9b77f1d5b359.tar.gz emacs-0d674a059d7b1366697cbc621c9a9b77f1d5b359.zip | |
(ftfont_open): Set members maybe_otf and otf of
ftfont_info only when HAVE_LIBOTF is defined.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ftfont.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/ftfont.c b/src/ftfont.c index 4404d6962d0..48244ff28dc 100644 --- a/src/ftfont.c +++ b/src/ftfont.c | |||
| @@ -735,8 +735,10 @@ ftfont_open (f, entity, pixel_size) | |||
| 735 | if (! ftfont_info) | 735 | if (! ftfont_info) |
| 736 | return NULL; | 736 | return NULL; |
| 737 | ftfont_info->ft_size = ft_size; | 737 | ftfont_info->ft_size = ft_size; |
| 738 | #ifdef HAVE_LIBOTF | ||
| 738 | ftfont_info->maybe_otf = ft_face->face_flags & FT_FACE_FLAG_SFNT; | 739 | ftfont_info->maybe_otf = ft_face->face_flags & FT_FACE_FLAG_SFNT; |
| 739 | ftfont_info->otf = NULL; | 740 | ftfont_info->otf = NULL; |
| 741 | #endif /* HAVE_LIBOTF */ | ||
| 740 | 742 | ||
| 741 | font = (struct font *) ftfont_info; | 743 | font = (struct font *) ftfont_info; |
| 742 | font->format = ftfont_font_format (pattern); | 744 | font->format = ftfont_font_format (pattern); |