alex/Adafruit-GFX-Library
1
0
Fork 0
mirror of https://github.com/adafruit/Adafruit-GFX-Library.git synced 2024-10-03 18:18:46 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge 4f0ab8bdac into 0e32d7dc76

Browse Source
This commit is contained in:
Dave 2024-10-02 01:19:58 +05:30 committed by GitHub
commit b3a414486c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Adafruit_GFX.cpp
View File

@ -1179,6 +1179,7 @@ void Adafruit_GFX::drawChar(int16_t x, int16_t y, unsigned char c,
// drawChar() directly with 'bad' characters of font may cause mayhem!
c -= (uint8_t)pgm_read_byte(&gfxFont->first);
uint8_t yAdvance = (uint8_t)pgm_read_byte(&gfxFont->yAdvance);
GFXglyph *glyph = pgm_read_glyph_ptr(gfxFont, c);
uint8_t *bitmap = pgm_read_bitmap_ptr(gfxFont);
@ -1220,10 +1221,11 @@ void Adafruit_GFX::drawChar(int16_t x, int16_t y, unsigned char c,
}
if (bits & 0x80) {
if (size_x == 1 && size_y == 1) {
writePixel(x + xo + xx, y + yo + yy, color);
writePixel(x + xo + xx, y + yo + yy + yAdvance, color);
} else {
writeFillRect(x + (xo16 + xx) * size_x, y + (yo16 + yy) * size_y,
size_x, size_y, color);
writeFillRect(x + (xo16 + xx) * size_x,
y + (yo16 + yy) * size_y + yAdvance * size_y, size_x,
size_y, color);
}
}
bits <<= 1;