netsurf: branch master updated. release/3.1-288-gdfc095b

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/dfc095bd900b37fb7e1dd... ...commit http://git.netsurf-browser.org/netsurf.git/commit/dfc095bd900b37fb7e1ddb2... ...tree http://git.netsurf-browser.org/netsurf.git/tree/dfc095bd900b37fb7e1ddb25f... The branch, master has been updated via dfc095bd900b37fb7e1ddb25fd2a85bf1839e41c (commit) from 80cc3266580e9fbd77f07b094f6248326cf2cee3 (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/netsurf.git/commit/?id=dfc095bd900b37fb7e1... commit dfc095bd900b37fb7e1ddb25fd2a85bf1839e41c Author: Michael Drake <tlsa(a)netsurf-browser.org&gt; Commit: Michael Drake <tlsa(a)netsurf-browser.org&gt; Display U+FFFD for characters > U+FFFF. diff --git a/framebuffer/font_internal.c b/framebuffer/font_internal.c index e514b12..4edb4ee 100644 --- a/framebuffer/font_internal.c +++ b/framebuffer/font_internal.c @@ -221,6 +221,12 @@ fb_get_glyph(uint32_t ucs4, enum fb_font_style style) unsigned int offset; uint16_t g_offset; + /* Internal font has no glyphs beyond U+FFFF and there isn't + * space to render a >4 digit codepoint; just show replacement + * character. */ + if (ucs4 > 0xffff) + ucs4 = 0xfffd; + switch (style) { case FB_BOLD_ITALIC: section = fb_bold_italic_section_table[ucs4 / 256]; ----------------------------------------------------------------------- Summary of changes: framebuffer/font_internal.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/framebuffer/font_internal.c b/framebuffer/font_internal.c index e514b12..4edb4ee 100644 --- a/framebuffer/font_internal.c +++ b/framebuffer/font_internal.c @@ -221,6 +221,12 @@ fb_get_glyph(uint32_t ucs4, enum fb_font_style style) unsigned int offset; uint16_t g_offset; + /* Internal font has no glyphs beyond U+FFFF and there isn't + * space to render a >4 digit codepoint; just show replacement + * character. */ + if (ucs4 > 0xffff) + ucs4 = 0xfffd; + switch (style) { case FB_BOLD_ITALIC: section = fb_bold_italic_section_table[ucs4 / 256]; -- NetSurf Browser