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

Merge remote-tracking branch 'origin/master' into vnc

Browse Source
This commit is contained in:
Gregory Nutt 2016-04-17 12:28:23 -06:00
commit a87f7c8399
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
graphics/Kconfig
View File

@ -57,7 +57,7 @@ config NX_WRITEONLY
defined.
config NX_UPDATE
bool "Display update hooks'
bool "Display update hooks"
default n
---help---
Enable a callout to inform some external module that the display has

6
graphics/nxbe/nxbe_filltrapezoid.c
View File

@ -49,11 +49,11 @@
****************************************************************************/
#ifndef MIN
# define MIN(a,b) (((a) < (b)) ? (a) : (b)
# define MIN(a,b) (((a) < (b)) ? (a) : (b))
#endif
#ifndef MAX
# define MAX(a,b) (((a) > (b)) ? (a) : (b)
# define MAX(a,b) (((a) > (b)) ? (a) : (b))
#endif
/****************************************************************************
@ -86,7 +86,7 @@ static void nxbe_clipfilltrapezoid(FAR struct nxbe_clipops_s *cops,
{
struct nxbe_filltrap_s *fillinfo = (struct nxbe_filltrap_s *)cops;
#ifdef CONFIG_NX_UPDATE
FAR const struct nxgl_rect_s *update;
struct nxgl_rect_s update;
#endif
/* Draw the trapezond */

2
graphics/nxbe/nxbe_move.c
View File

@ -79,7 +79,7 @@ static void nxbe_clipmovesrc(FAR struct nxbe_clipops_s *cops,
struct nxbe_move_s *info = (struct nxbe_move_s *)cops;
struct nxgl_point_s offset;
#ifdef CONFIG_NX_UPDATE
FAR const struct nxgl_rect_s *update;
struct nxgl_rect_s update;
#endif
if (info->offset.x != 0 || info->offset.y != 0)