mirror of
https://github.com/apache/nuttx.git
synced 2026-06-04 23:03:27 +08:00
Fix a bug in the getrectangle logic
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4058 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
@@ -69,23 +69,6 @@ struct nxbe_fill_s
|
|||||||
* Private Functions
|
* Private Functions
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
/****************************************************************************
|
|
||||||
* Name: nxbe_clipfill
|
|
||||||
*
|
|
||||||
* Description:
|
|
||||||
* Called from nxbe_clipper() to performed the fill operation on visible portions
|
|
||||||
* of the rectangle.
|
|
||||||
*
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
static void nxbe_clipfill(FAR struct nxbe_clipops_s *cops,
|
|
||||||
FAR struct nxbe_plane_s *plane,
|
|
||||||
FAR const struct nxgl_rect_s *rect)
|
|
||||||
{
|
|
||||||
struct nxbe_fill_s *fillinfo = (struct nxbe_fill_s *)cops;
|
|
||||||
plane->fillrectangle(&plane->pinfo, rect, fillinfo->color);
|
|
||||||
}
|
|
||||||
|
|
||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
* Public Functions
|
* Public Functions
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
@@ -116,7 +99,6 @@ void nxbe_getrectangle(FAR struct nxbe_window_s *wnd,
|
|||||||
FAR uint8_t *dest, unsigned int deststride)
|
FAR uint8_t *dest, unsigned int deststride)
|
||||||
{
|
{
|
||||||
struct nxgl_rect_s remaining;
|
struct nxgl_rect_s remaining;
|
||||||
int i;
|
|
||||||
|
|
||||||
#ifdef CONFIG_DEBUG
|
#ifdef CONFIG_DEBUG
|
||||||
if (!wnd || !rect || ! rect || plane >= wnd->be->vinfo.nplanes)
|
if (!wnd || !rect || ! rect || plane >= wnd->be->vinfo.nplanes)
|
||||||
@@ -144,6 +126,6 @@ void nxbe_getrectangle(FAR struct nxbe_window_s *wnd,
|
|||||||
* to this window.
|
* to this window.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
FAR struct nxbe_plane_s *pplane = &wnd->be->plane[i];
|
FAR struct nxbe_plane_s *pplane = &wnd->be->plane[plane];
|
||||||
pplane->getrectangle(&pplane->pinfo, rect, dest, deststride);
|
pplane->getrectangle(&pplane->pinfo, rect, dest, deststride);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user