Gitweb links:
...log
http://git.netsurf-browser.org/librufl.git/shortlog/66623d6f17657d77a7d436fa42095424d0a03b8b
...commit
http://git.netsurf-browser.org/librufl.git/commit/66623d6f17657d77a7d436fa42095424d0a03b8b
...tree
http://git.netsurf-browser.org/librufl.git/tree/66623d6f17657d77a7d436fa42095424d0a03b8b
The branch, master has been updated
via 66623d6f17657d77a7d436fa42095424d0a03b8b (commit)
via f3241e99a07530ef6c67bea4a011d65736649333 (commit)
via 30b5997d61f875591460fe0a7feda1b7f04fea66 (commit)
from 8b5ee930f2b3ff52ef7bfee65e946f9c5453d3ce (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=66623d6f17657d77a7d436fa42095424d0a03b8b
commit 66623d6f17657d77a7d436fa42095424d0a03b8b
Author: John-Mark Bell <[email protected]>
Commit: John-Mark Bell <[email protected]>
Fix typo in log message
diff --git a/src/rufl_init.c b/src/rufl_init.c
index de4c4de..c3ddac3 100644
--- a/src/rufl_init.c
+++ b/src/rufl_init.c
@@ -239,7 +239,7 @@ rufl_code rufl_init(void)
code = rufl_init_family_menu();
if (code != rufl_OK) {
- LOG("rufl_init_substitution_table: 0x%x", code);
+ LOG("rufl_init_family_menu: 0x%x", code);
rufl_quit();
xhourglass_off();
return code;
commitdiff
http://git.netsurf-browser.org/librufl.git/commit/?id=f3241e99a07530ef6c67bea4a011d65736649333
commit f3241e99a07530ef6c67bea4a011d65736649333
Author: John-Mark Bell <[email protected]>
Commit: John-Mark Bell <[email protected]>
Old FontManager: ignore fonts with no mappings
Ordinarily, this shouldn't happen but, if it does, we don't want
to pollute the cache with a blank charset for the font (as we'd
prefer to rescan the font next time around in case whatever caused
it to have no mappings got fixed in the interim).
Existing caches containing blank charsets for such fonts will
remain untouched -- this is all best effort, so forcing a rescan
by bumping the cache version is not worth doing here.
diff --git a/src/rufl_init.c b/src/rufl_init.c
index f9ff55f..de4c4de 100644
--- a/src/rufl_init.c
+++ b/src/rufl_init.c
@@ -877,6 +877,13 @@ rufl_code rufl_init_scan_font_old(unsigned int font_index)
}
}
+ if (num_umaps == 0) {
+ /* No mappings found: font is empty or couldn't be found */
+ free(umap);
+ free(charset);
+ return rufl_OK;
+ }
+
/* shrink-wrap */
charset->size = offsetof(struct rufl_character_set, block) +
32 * last_used;
commitdiff
http://git.netsurf-browser.org/librufl.git/commit/?id=30b5997d61f875591460fe0a7feda1b7f04fea66
commit 30b5997d61f875591460fe0a7feda1b7f04fea66
Author: John-Mark Bell <[email protected]>
Commit: John-Mark Bell <[email protected]>
Accept FontEncodingNotFound for symbol fonts, too.
diff --git a/src/rufl_init.c b/src/rufl_init.c
index e37b36f..f9ff55f 100644
--- a/src/rufl_init.c
+++ b/src/rufl_init.c
@@ -861,9 +861,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 &&
rufl_fm_error->errnum !=
- error_FILE_NOT_FOUND)) {
+ 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 | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/rufl_init.c b/src/rufl_init.c
index e37b36f..c3ddac3 100644
--- a/src/rufl_init.c
+++ b/src/rufl_init.c
@@ -239,7 +239,7 @@ rufl_code rufl_init(void)
code = rufl_init_family_menu();
if (code != rufl_OK) {
- LOG("rufl_init_substitution_table: 0x%x", code);
+ LOG("rufl_init_family_menu: 0x%x", code);
rufl_quit();
xhourglass_off();
return code;
@@ -861,9 +861,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 &&
rufl_fm_error->errnum !=
- error_FILE_NOT_FOUND)) {
+ error_FONT_ENCODING_NOT_FOUND)) {
free(charset);
for (i = 0; i < num_umaps; i++)
free((umap + i)->encoding);
@@ -875,6 +877,13 @@ rufl_code rufl_init_scan_font_old(unsigned int font_index)
}
}
+ if (num_umaps == 0) {
+ /* No mappings found: font is empty or couldn't be found */
+ free(umap);
+ free(charset);
+ return rufl_OK;
+ }
+
/* shrink-wrap */
charset->size = offsetof(struct rufl_character_set, block) +
32 * last_used;
--
RISC OS Unicode Font Library
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
