diff options
| author | John-Mark Bell <jmb@netsurf-browser.org> | 2018-01-21 17:35:31 +0000 |
|---|---|---|
| committer | John-Mark Bell <jmb@netsurf-browser.org> | 2018-01-21 17:35:31 +0000 |
| commit | 8b5ee930f2b3ff52ef7bfee65e946f9c5453d3ce (patch) | |
| tree | edfb00debdc545aacb9b56cc99544794baaccea7 | |
| parent | 34730bbeca0e9eba305102f0b2911cff16b57509 (diff) | |
| download | librufl-8b5ee930f2b3ff52ef7bfee65e946f9c5453d3ce.tar.gz librufl-8b5ee930f2b3ff52ef7bfee65e946f9c5453d3ce.tar.bz2 | |
Tolerate FontEncodingNotFound from "old" FM.
Additionally, log the FontManager version.
| -rw-r--r-- | src/rufl_init.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/rufl_init.c b/src/rufl_init.c index aed3886..e37b36f 100644 --- a/src/rufl_init.c +++ b/src/rufl_init.c @@ -151,9 +151,6 @@ rufl_code rufl_init(void) xfont_lose_font(font); } - LOG("%s font manager%s", - rufl_old_font_manager ? "old" : "new", - rufl_broken_font_enumerate_characters ? " (broken fec)" : ""); /* test if the font manager supports background blending */ rufl_fm_error = xfont_cache_addr(&fm_version, 0, 0); @@ -166,6 +163,11 @@ rufl_code rufl_init(void) if (fm_version >= 335) rufl_can_background_blend = true; + LOG("%s font manager (v %d.%d)%s", + rufl_old_font_manager ? "old" : "new", + fm_version / 100, fm_version % 100, + rufl_broken_font_enumerate_characters ? " (broken fec)" : ""); + code = rufl_init_font_list(); if (code != rufl_OK) { LOG("rufl_init_font_list: 0x%x", code); @@ -795,9 +797,11 @@ rufl_code rufl_init_scan_font_old(unsigned int font_index) /* Not finding the font isn't fatal */ if (code != rufl_FONT_MANAGER_ERROR || (rufl_fm_error->errnum != - error_FONT_NOT_FOUND && + error_FONT_NOT_FOUND && rufl_fm_error->errnum != - error_FILE_NOT_FOUND)) { + error_FILE_NOT_FOUND && + rufl_fm_error->errnum != + error_FONT_ENCODING_NOT_FOUND)) { free(charset); for (i = 0; i < num_umaps; i++) free((umap + i)->encoding); |