diff options
| author | Nick Brassel <nick@tzarc.org> | 2023-05-07 00:53:14 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-06 15:53:14 +0100 |
| commit | 88780bf710a0f9a3a204d0feebac90755a2f3fff (patch) | |
| tree | d059857f4c262823bfa798303aff2b96c459ded8 | |
| parent | a4be9b0ccbdf5c03b97099ba9efb60a1235694f9 (diff) | |
Fixup QP font rendering when `--no-ascii` is specified. (#20637)
| -rw-r--r-- | quantum/painter/qp_draw_text.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/quantum/painter/qp_draw_text.c b/quantum/painter/qp_draw_text.c index f9fb2bf08f..20edeaf379 100644 --- a/quantum/painter/qp_draw_text.c +++ b/quantum/painter/qp_draw_text.c | |||
| @@ -233,7 +233,7 @@ static inline bool qp_drawtext_prepare_glyph_for_render(qff_font_handle_t *qff_f | |||
| 233 | uint8_t glyph_width = (uint8_t)(glyph_info.value & QFF_GLYPH_WIDTH_MASK); | 233 | uint8_t glyph_width = (uint8_t)(glyph_info.value & QFF_GLYPH_WIDTH_MASK); |
| 234 | uint32_t glyph_offset = ((glyph_info.value & QFF_GLYPH_OFFSET_MASK) >> QFF_GLYPH_WIDTH_BITS); | 234 | uint32_t glyph_offset = ((glyph_info.value & QFF_GLYPH_OFFSET_MASK) >> QFF_GLYPH_WIDTH_BITS); |
| 235 | uint32_t data_offset = sizeof(qff_font_descriptor_v1_t) // Skip the font descriptor | 235 | uint32_t data_offset = sizeof(qff_font_descriptor_v1_t) // Skip the font descriptor |
| 236 | + sizeof(qff_ascii_glyph_table_v1_t) // Skip the ascii table | 236 | + (qff_font->has_ascii_table ? sizeof(qff_ascii_glyph_table_v1_t) : 0) // Skip the ascii table |
| 237 | + (qff_font->num_unicode_glyphs > 0 ? (sizeof(qff_unicode_glyph_table_v1_t) + (qff_font->num_unicode_glyphs * sizeof(qff_unicode_glyph_v1_t))) : 0) // Skip the unicode table | 237 | + (qff_font->num_unicode_glyphs > 0 ? (sizeof(qff_unicode_glyph_table_v1_t) + (qff_font->num_unicode_glyphs * sizeof(qff_unicode_glyph_v1_t))) : 0) // Skip the unicode table |
| 238 | + (qff_font->has_palette ? (sizeof(qgf_palette_v1_t) + ((1 << qff_font->bpp) * sizeof(qgf_palette_entry_v1_t))) : 0) // Skip the palette | 238 | + (qff_font->has_palette ? (sizeof(qgf_palette_v1_t) + ((1 << qff_font->bpp) * sizeof(qgf_palette_entry_v1_t))) : 0) // Skip the palette |
| 239 | + sizeof(qgf_block_header_v1_t) // Skip the data block header | 239 | + sizeof(qgf_block_header_v1_t) // Skip the data block header |
| @@ -268,7 +268,7 @@ static inline bool qp_drawtext_prepare_glyph_for_render(qff_font_handle_t *qff_f | |||
| 268 | uint8_t glyph_width = (uint8_t)(glyph_info.value & QFF_GLYPH_WIDTH_MASK); | 268 | uint8_t glyph_width = (uint8_t)(glyph_info.value & QFF_GLYPH_WIDTH_MASK); |
| 269 | uint32_t glyph_offset = ((glyph_info.value & QFF_GLYPH_OFFSET_MASK) >> QFF_GLYPH_WIDTH_BITS); | 269 | uint32_t glyph_offset = ((glyph_info.value & QFF_GLYPH_OFFSET_MASK) >> QFF_GLYPH_WIDTH_BITS); |
| 270 | uint32_t data_offset = sizeof(qff_font_descriptor_v1_t) // Skip the font descriptor | 270 | uint32_t data_offset = sizeof(qff_font_descriptor_v1_t) // Skip the font descriptor |
| 271 | + sizeof(qff_ascii_glyph_table_v1_t) // Skip the ascii table | 271 | + (qff_font->has_ascii_table ? sizeof(qff_ascii_glyph_table_v1_t) : 0) // Skip the ascii table |
| 272 | + (qff_font->num_unicode_glyphs > 0 ? (sizeof(qff_unicode_glyph_table_v1_t) + (qff_font->num_unicode_glyphs * sizeof(qff_unicode_glyph_v1_t))) : 0) // Skip the unicode table | 272 | + (qff_font->num_unicode_glyphs > 0 ? (sizeof(qff_unicode_glyph_table_v1_t) + (qff_font->num_unicode_glyphs * sizeof(qff_unicode_glyph_v1_t))) : 0) // Skip the unicode table |
| 273 | + (qff_font->has_palette ? (sizeof(qgf_palette_v1_t) + ((1 << qff_font->bpp) * sizeof(qgf_palette_entry_v1_t))) : 0) // Skip the palette | 273 | + (qff_font->has_palette ? (sizeof(qgf_palette_v1_t) + ((1 << qff_font->bpp) * sizeof(qgf_palette_entry_v1_t))) : 0) // Skip the palette |
| 274 | + sizeof(qgf_block_header_v1_t) // Skip the data block header | 274 | + sizeof(qgf_block_header_v1_t) // Skip the data block header |