diff options
Diffstat (limited to 'frontends/framebuffer/font_internal.c')
-rw-r--r-- | frontends/framebuffer/font_internal.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/frontends/framebuffer/font_internal.c b/frontends/framebuffer/font_internal.c index ff3471d1d..4d28c61ad 100644 --- a/frontends/framebuffer/font_internal.c +++ b/frontends/framebuffer/font_internal.c @@ -23,6 +23,7 @@ #include <stdlib.h> #include "utils/nsoption.h" +#include "utils/utils.h" #include "utils/utf8.h" #include "netsurf/utf8.h" #include "netsurf/layout.h" @@ -212,7 +213,7 @@ fb_get_font_size(const plot_font_style_t *fstyle) { int size = fstyle->size * 10 / (((nsoption_int(font_min_size) * 3 + - nsoption_int(font_size)) / 4) * FONT_SIZE_SCALE); + nsoption_int(font_size)) / 4) * PLOT_STYLE_SCALE); if (size > 2) size = 2; else if (size <= 0) @@ -270,7 +271,8 @@ fb_get_glyph(uint32_t ucs4, enum fb_font_style style, int scale) break; } } - /* Fall through. */ + fallthrough; + case FB_BOLD: section = fb_bold_section_table[ucs4 / 256]; if (section != 0 || ucs4 / 256 == 0) { @@ -281,7 +283,8 @@ fb_get_glyph(uint32_t ucs4, enum fb_font_style style, int scale) break; } } - /* Fall through. */ + fallthrough; + case FB_ITALIC: section = fb_italic_section_table[ucs4 / 256]; if (section != 0 || ucs4 / 256 == 0) { @@ -292,7 +295,8 @@ fb_get_glyph(uint32_t ucs4, enum fb_font_style style, int scale) break; } } - /* Fall through. */ + fallthrough; + case FB_REGULAR: section = fb_regular_section_table[ucs4 / 256]; if (section != 0 || ucs4 / 256 == 0) { @@ -303,7 +307,8 @@ fb_get_glyph(uint32_t ucs4, enum fb_font_style style, int scale) break; } } - /* Fall through. */ + fallthrough; + default: glyph_data = get_codepoint(ucs4, style & FB_ITALIC); break; |