sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

apps/graphics/pdcurs34: Correct logic that clears the screen. For the casee of BPP < 8, it was writing beyond the end of the framebuffer and clobbering things.

Browse Source
This commit is contained in:
Gregory Nutt 2017-11-23 09:30:14 -06:00
parent 611a0e4a79
commit 421b3009e3
1 changed files with 43 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
graphics/pdcurs34/nuttx/pdcdisp.c
View File

@ -624,7 +624,6 @@ void PDC_transform_line(int lineno, int x, int len, const chtype *srcp)
void PDC_clear_screen(FAR struct pdc_fbstate_s *fbstate) void PDC_clear_screen(FAR struct pdc_fbstate_s *fbstate)
{ {
FAR uint8_t *line; FAR uint8_t *line;
FAR pdc_color_t *dest;
int row; int row;
int col; int col;
@ -633,7 +632,48 @@ void PDC_clear_screen(FAR struct pdc_fbstate_s *fbstate)
int ret; int ret;
#endif #endif
/* Write the intial color into the entire framebuffer */ #if PDCURSES_BPP < 8
FAR uint8_t *dest;
uint8_t color8;
int width;
/* Get a byte that packs multiple pixels into one byte */
color8 = PDCURSES_INIT_COLOR;
#if PDCURSES_BPP < 2 /* BPP = 1 */
color8 &= 1; /* Isolate 0 */
color8 = color8 << 1 | color8; /* Replicate 0 to 1 */
#endif
#if PDCURSES_BPP < 4 /* BPP = (1,2} */
color8 &= 3; /* Isolate 0-1 */
color8 = color8 << 2 | color8; /* Replicate 0-1 to 2-3 */
#endif /* BPP = (1,2,4} */
color8 &= 15; /* Isolate 0-3 */
color8 = color8 << 4 | color8; /* Replicate 0-3 to 4-7 */
/* Get the width of the display in bytes. */
width = fbstate->xres / PDCURSES_PPB;
/* Now copy the color into the entire glyph region */
/* Write the initial color into the entire framebuffer */
for (row = 0, line = (FAR uint8_t *)fbstate->fbmem;
row < fbstate->yres;
row++, line += fbstate->stride)
{
for (col = 0, dest = (FAR pdc_color_t *)line;
col < width;
col++)
{
*dest++ = color8;
}
}
#else
FAR pdc_color_t *dest;
/* Write the initial color into the entire framebuffer */
for (row = 0, line = (FAR uint8_t *)fbstate->fbmem; for (row = 0, line = (FAR uint8_t *)fbstate->fbmem;
row < fbstate->yres; row < fbstate->yres;
@ -646,6 +686,7 @@ void PDC_clear_screen(FAR struct pdc_fbstate_s *fbstate)
*dest++ = PDCURSES_INIT_COLOR; *dest++ = PDCURSES_INIT_COLOR;
} }
} }
#endif
#ifdef CONFIG_LCD_UPDATE #ifdef CONFIG_LCD_UPDATE
/* Update the entire display */ /* Update the entire display */
@ -665,4 +706,3 @@ void PDC_clear_screen(FAR struct pdc_fbstate_s *fbstate)
} }
#endif #endif
} }