Gitweb links:
...log
http://git.netsurf-browser.org/librufl.git/shortlog/8b5ee930f2b3ff52ef7bfee65e946f9c5453d3ce
...commit
http://git.netsurf-browser.org/librufl.git/commit/8b5ee930f2b3ff52ef7bfee65e946f9c5453d3ce
...tree
http://git.netsurf-browser.org/librufl.git/tree/8b5ee930f2b3ff52ef7bfee65e946f9c5453d3ce
The branch, master has been updated
via 8b5ee930f2b3ff52ef7bfee65e946f9c5453d3ce (commit)
from 34730bbeca0e9eba305102f0b2911cff16b57509 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/librufl.git/commit/?id=8b5ee930f2b3ff52ef7bfee65e946f9c5453d3ce
commit 8b5ee930f2b3ff52ef7bfee65e946f9c5453d3ce
Author: John-Mark Bell <[email protected]>
Commit: John-Mark Bell <[email protected]>
Tolerate FontEncodingNotFound from "old" FM.
Additionally, log the FontManager version.
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);
-----------------------------------------------------------------------
Summary of changes:
src/rufl_init.c | 14 +++++++++-----
1 file 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);
--
RISC OS Unicode Font Library
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
