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

apps/example/fb: Restores 0205eeef52ff0324931f395ba5385fee9f2f644e. It was correct all along. Also fixes calculation of the end byte position.

Browse Source
This commit is contained in:
Gregory Nutt 2017-11-24 07:10:52 -06:00
parent 0d4fe9518a
commit 52dc96e5c3
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
examples/fb/fb_main.c
View File

@ -176,11 +176,27 @@ static void draw_rect1(FAR struct fb_state_s *state,
int x; int x;
int y; int y;
/* Calculate the framebuffer address of the first row to draw on */
row = (FAR uint8_t *)state->fbmem + state->pinfo.stride * rect->pt1.y; row = (FAR uint8_t *)state->fbmem + state->pinfo.stride * rect->pt1.y;
/* Calculate the start byte position rounding down so that we get the
* first byte containing any part of the pixel sequence. Then calculate
* the last byte position with a ceil() operation so it includes any final
* final pixels of the sequence.
*/
startx = (rect->pt1.x >> 3); startx = (rect->pt1.x >> 3);
endx = (rect->pt2.x >> 3); endx = ((rect->pt2.x + 7) >> 3);
lmask = 0xff << (8 - (rect->pt1.x & 3));
rmask = 0xff >> (rect->pt2.x & 3); /* Caculate a mask on the first and last bytes of the sequence that may
* not be completely filled with pixel.
*/
lmask = 0xff << (8 - (rect->pt1.x & 7));
rmask = 0xff >> (rect->pt2.x & 7);
/* Now draw each row, one-at-a-time */
for (y = rect->pt1.y; y <= rect->pt2.y; y++) for (y = rect->pt1.y; y <= rect->pt2.y; y++)
{ {
@ -204,7 +220,7 @@ static void draw_rect1(FAR struct fb_state_s *state,
*pixel = (*pixel & lmask) | (color8 & ~lmask); *pixel = (*pixel & lmask) | (color8 & ~lmask);
pixel++; pixel++;
/* Handle all middle bytes */ /* Handle all middle bytes in the row */
for (x = startx + 1; x < endx; x++) for (x = startx + 1; x < endx; x++)
{ {