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

graphics/nxbe/nxbe_getrectangle.c: Fix an error in coordinate system usage. Expected rectangle in device coordinate frame, but was passing the rectangle in window-relative coordinate frame.

Browse Source
This commit is contained in:
Gregory Nutt 2019-05-10 09:18:17 -06:00
parent 392809fae5
commit 3874f468de
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
graphics/nxbe/nxbe_getrectangle.c
View File

@ -104,7 +104,7 @@ static inline void nxbe_getrectangle_dev(FAR struct nxbe_window_s *wnd,
* *
* Input Parameters: * Input Parameters:
* wnd - The window structure reference * wnd - The window structure reference
* rect - The location to be copied * rect - The location to be copied (in device coordinates, clipped)
* plane - Specifies the color plane to get from. * plane - Specifies the color plane to get from.
* dest - The location to copy the memory region * dest - The location to copy the memory region
* deststride - The width, in bytes, of the dest memory * deststride - The width, in bytes, of the dest memory
@ -126,8 +126,8 @@ static inline void nxbe_getrectangle_pwfb(FAR struct nxbe_window_s *wnd,
DEBUGASSERT(pplane != NULL && pplane->pwfb.getrectangle != NULL); DEBUGASSERT(pplane != NULL && pplane->pwfb.getrectangle != NULL);
/* The rectangle that we receive here is in abolute device coordinates. We /* The rectangle that we receive here is in abolute device coordinates.
* need to restore this to windows relative coordinates. * We need to restore this to windows relative coordinates.
*/ */
nxgl_rectoffset(&relrect, rect, -wnd->bounds.pt1.x, -wnd->bounds.pt1.y); nxgl_rectoffset(&relrect, rect, -wnd->bounds.pt1.x, -wnd->bounds.pt1.y);
@ -153,7 +153,7 @@ static inline void nxbe_getrectangle_pwfb(FAR struct nxbe_window_s *wnd,
* *
* Input Parameters: * Input Parameters:
* wnd - The window structure reference * wnd - The window structure reference
* rect - The location to be copied * rect - The location to be copied (in window-relative coordinates)
* plane - Specifies the color plane to get from. * plane - Specifies the color plane to get from.
* dest - The location to copy the memory region * dest - The location to copy the memory region
* deststride - The width, in bytes, of the dest memory * deststride - The width, in bytes, of the dest memory
@ -174,7 +174,7 @@ void nxbe_getrectangle(FAR struct nxbe_window_s *wnd,
DEBUGASSERT(plane < wnd->be->vinfo.nplanes); DEBUGASSERT(plane < wnd->be->vinfo.nplanes);
/* Offset the rectangle by the window origin to convert it into a /* Offset the rectangle by the window origin to convert it into a
* bounding box * bounding box in device coordinates
*/ */
nxgl_rectoffset(&remaining, rect, wnd->bounds.pt1.x, wnd->bounds.pt1.y); nxgl_rectoffset(&remaining, rect, wnd->bounds.pt1.x, wnd->bounds.pt1.y);
@ -197,7 +197,7 @@ void nxbe_getrectangle(FAR struct nxbe_window_s *wnd,
if (NXBE_ISRAMBACKED(wnd)) if (NXBE_ISRAMBACKED(wnd))
{ {
nxbe_getrectangle_pwfb(wnd, rect, plane, dest, deststride); nxbe_getrectangle_pwfb(wnd, &remaining, plane, dest, deststride);
} }
else else
#endif #endif
@ -224,7 +224,7 @@ void nxbe_getrectangle(FAR struct nxbe_window_s *wnd,
* not necessarily belong to this window. * not necessarily belong to this window.
*/ */
nxbe_getrectangle_dev(wnd, rect, plane, dest, deststride); nxbe_getrectangle_dev(wnd, &remaining, plane, dest, deststride);
#ifdef CONFIG_NX_SWCURSOR #ifdef CONFIG_NX_SWCURSOR
/* Was the software cursor visible? */ /* Was the software cursor visible? */