diff options
| author | Grigori Goronzy <greg@chown.ath.cx> | 2015-06-12 03:31:35 +0200 |
|---|---|---|
| committer | Grigori Goronzy <greg@chown.ath.cx> | 2015-07-10 10:43:16 +0200 |
| commit | 08a6b1607016ff1855c746b296ab12c1c8a3a0d1 (patch) | |
| tree | b07e2cad071d3402099ec1557038463d7c44746b | |
| parent | a8a05b81cbb885088eeec720a188d8feb0109f4e (diff) | |
| download | libass-08a6b1607016ff1855c746b296ab12c1c8a3a0d1.tar.bz2 libass-08a6b1607016ff1855c746b296ab12c1c8a3a0d1.tar.xz | |
fontselect: replace magic numbers (NFC)
| -rw-r--r-- | libass/ass_fontselect.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libass/ass_fontselect.c b/libass/ass_fontselect.c index 783f44c..fc36dde 100644 --- a/libass/ass_fontselect.c +++ b/libass/ass_fontselect.c @@ -31,6 +31,7 @@ #include <ft2build.h> #include FT_FREETYPE_H #include FT_SFNT_NAMES_H +#include FT_TRUETYPE_IDS_H #include <iconv.h> #include "ass_utils.h" @@ -632,7 +633,9 @@ get_font_info(FT_Library lib, FT_Face face, ASS_FontProviderMetaData *info) if (FT_Get_Sfnt_Name(face, i, &name)) continue; - if (name.platform_id == 3 && (name.name_id == 4 || name.name_id == 1)) { + if (name.platform_id == TT_PLATFORM_MICROSOFT && + (name.name_id == TT_NAME_ID_FULL_NAME || + name.name_id == TT_NAME_ID_FONT_FAMILY)) { char buf[1024]; char *bufptr = buf; size_t inbytes = name.string_len; @@ -644,14 +647,14 @@ get_font_info(FT_Library lib, FT_Face face, ASS_FontProviderMetaData *info) *bufptr = '\0'; - if (name.name_id == 4) { + if (name.name_id == TT_NAME_ID_FULL_NAME) { fullnames[num_fullname] = strdup_trimmed(buf); if (fullnames[num_fullname] == NULL) goto error; num_fullname++; } - if (name.name_id == 1) { + if (name.name_id == TT_NAME_ID_FONT_FAMILY) { families[num_family] = strdup_trimmed(buf); if (families[num_family] == NULL) goto error; |