sambuc/retrobsd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bug in hx8357: rasterizing glyphs with width>16.

Browse Source
This commit is contained in:
Serge Vakulenko
2015-10-09 13:21:29 -07:00
parent 08edaaba8c
commit d2fb9b98a6
2 changed files with 42 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
sys/pic32/hx8357.c
View File

@@ -420,7 +420,8 @@ static void newLine(const struct gpanel_font_t *font)
void drawGlyph(const struct gpanel_font_t *font,
int color, int background, int width, const unsigned short *bits)
{
int i, j;
int h, w;
unsigned bitmask = 0;
if (background >= 0) {
/*
@@ -430,33 +431,38 @@ void drawGlyph(const struct gpanel_font_t *font,
while (PMMODE & PIC32_PMMODE_BUSY);
PMADDR = 0x0001;
/* Loop on each glyph row, backwards from bottom to top. */
for (i=0; i<font->height; i++) {
unsigned glyph_row = bits[i];
/* Loop on each glyph row. */
for (h=0; h<font->height; h++) {
/* Loop on every pixel in the row (left to right). */
for (w=0; w<width; w++) {
if ((w & 15) == 0)
bitmask = *bits++;
else
bitmask <<= 1;
/* Loop on every two pixels in the row (left to right). */
for (j=0; j<width; j++) {
while (PMMODE & PIC32_PMMODE_BUSY);
if (glyph_row & 0x8000)
while (PMMODE & PIC32_PMMODE_BUSY)
;
if (bitmask & 0x8000)
PMDIN = color;
else
PMDIN = background;
glyph_row <<= 1;
}
}
} else {
/*
* Transparent background.
*/
/* Loop on each glyph row, backwards from bottom to top. */
for (i=0; i<font->height; i++) {
unsigned glyph_row = bits[i];
/* Loop on each glyph row. */
for (h=0; h<font->height; h++) {
/* Loop on every pixel in the row (left to right). */
for (w=0; w<width; w++) {
if ((w & 15) == 0)
bitmask = *bits++;
else
bitmask <<= 1;
/* Loop on every two pixels in the row (left to right). */
for (j=0; j<width; j++) {
if (glyph_row & 0x8000)
setPixel(_col + j, _row + i, color);
glyph_row <<= 1;
if (bitmask & 0x8000)
setPixel(_col + w, _row + h, color);
}
}
}