Browse Source

Fix a bug that can cause large fonts to not be read correctly.

remotes/origin_old/release/v2.9
inmarket 6 years ago
parent
commit
9500ed2bcc
  1. 2
      src/gdisp/mcufont/mf_bwfont.h
  2. 2
      src/gdisp/mcufont/mf_rlefont.c
  3. 2
      src/gdisp/mcufont/mf_rlefont.h

2
src/gdisp/mcufont/mf_bwfont.h

@ -63,7 +63,7 @@ struct mf_bwfont_s
const uint8_t version;
/* Number of character ranges. */
const uint8_t char_range_count;
const uint16_t char_range_count;
/* Array of the character ranges */
const struct mf_bwfont_char_range_s *char_ranges;

2
src/gdisp/mcufont/mf_rlefont.c

@ -46,7 +46,7 @@ static const uint8_t *find_glyph(const struct mf_rlefont_s *font,
index = character - range->first_char;
if (character >= range->first_char && index < range->char_count)
{
uint16_t offset = range->glyph_offsets[index];
unsigned offset = range->glyph_offsets[index];
return &range->glyph_data[offset];
}
}

2
src/gdisp/mcufont/mf_rlefont.h

@ -60,7 +60,7 @@ struct mf_rlefont_s
const uint8_t dict_entry_count;
/* Number of discontinuous character ranges */
const uint8_t char_range_count;
const uint16_t char_range_count;
/* Array of the character ranges */
const struct mf_rlefont_char_range_s *char_ranges;

Loading…
Cancel
Save