diff options
author | Wu, Chia-I (吳佳一) <olvaffe@gmail.com> | 2006-02-14 07:01:29 +0000 |
---|---|---|
committer | Wu, Chia-I (吳佳一) <olvaffe@gmail.com> | 2006-02-14 07:01:29 +0000 |
commit | 65863a5712376b796ce82b3b0db26b85a64ea33f (patch) | |
tree | 934384101db1ea553c1019a3e370831539a95678 /src/sfnt/sfdriver.c | |
parent | f5aa47beb077998675f5adc38c94aaf7ee8a447e (diff) | |
download | freetype2-65863a5712376b796ce82b3b0db26b85a64ea33f.tar.gz |
Clean up the SFNT_Interface. In this pass, we want to treat the font
directory (offset table and table directory) as a normal table like
the others. This also means that TTC is no longer recognized there,
but in `init_face'.
* include/freetype/internal/sfnt.h (SFNT_Interface),
src/sfnt/sfdriver.c: `load_sfnt_header' and `load_directory' are
combined and renamed to `load_font_dir'.
* src/sfnt/ttload.h, src/sfnt/ttload.c:
s/sfnt_dir_check/check_table_dir/.
`sfnt_init' is moved to sfobjs.c and renamed to `sfnt_open_font'.
`tt_face_load_sfnt_header' and `tt_face_load_directory' are combined
and renamed to `tt_face_load_font_dir'.
* src/sfnt/sfobjs.c (sfnt_init_face): Recognize TTC here.
Diffstat (limited to 'src/sfnt/sfdriver.c')
-rw-r--r-- | src/sfnt/sfdriver.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/sfnt/sfdriver.c b/src/sfnt/sfdriver.c index a43ac01ed..f45195072 100644 --- a/src/sfnt/sfdriver.c +++ b/src/sfnt/sfdriver.c @@ -386,8 +386,7 @@ sfnt_get_interface, tt_face_load_any, - tt_face_load_sfnt_header, - tt_face_load_directory, + tt_face_load_font_dir, tt_face_load_head, tt_face_load_hhea, |