diff options
Diffstat (limited to 'nuttx/graphics')
-rw-r--r-- | nuttx/graphics/Makefile | 2 | ||||
-rw-r--r-- | nuttx/graphics/nxglib/nxglib_copyrectangle.c | 8 | ||||
-rw-r--r-- | nuttx/graphics/nxglib/nxglib_fillrectangle.c | 4 | ||||
-rw-r--r-- | nuttx/graphics/nxglib/nxglib_filltrapezoid.c | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/nuttx/graphics/Makefile b/nuttx/graphics/Makefile index 63f1b82de..34e0c6984 100644 --- a/nuttx/graphics/Makefile +++ b/nuttx/graphics/Makefile @@ -42,7 +42,7 @@ include nxglib/Make.defs DEPPATH += --dep-path nxglib CFLAGS += ${shell $(TOPDIR)/tools/incdir.sh "$(CC)" $(TOPDIR)/graphics/nxglib} -HAVENX = `if [ -d nx ]; then echo "y"; else echo "n";fi` +HAVENX := ${shell if [ -d nx ]; then echo "y"; else echo "n";fi} ifeq ($(HAVENX),y) include nx/Make.defs DEPPATH += --dep-path nx diff --git a/nuttx/graphics/nxglib/nxglib_copyrectangle.c b/nuttx/graphics/nxglib/nxglib_copyrectangle.c index 0dd01853c..03068b89e 100644 --- a/nuttx/graphics/nxglib/nxglib_copyrectangle.c +++ b/nuttx/graphics/nxglib/nxglib_copyrectangle.c @@ -70,7 +70,7 @@ ****************************************************************************/ /**************************************************************************** - * Name: nxs_copyrectangle_*bpp + * Name: nxgl_copyrectangle_*bpp * * Descripton: * Copy a rectangular bitmap image into the specific position in the @@ -78,9 +78,9 @@ * ****************************************************************************/ -void NXGL_FUNCNAME(nxs_copyrectangle,NXGLIB_SUFFIX) +void NXGL_FUNCNAME(nxgl_copyrectangle,NXGLIB_SUFFIX) (FAR struct fb_planeinfo_s *pinfo, FAR const struct nxgl_rect_s *dest, - FAR const NXGL_PIXEL_T *src, FAR const struct nxgl_point_s *origin, + FAR const void *src, FAR const struct nxgl_point_s *origin, unsigned int srcstride) { const ubyte *sptr; @@ -105,7 +105,7 @@ void NXGL_FUNCNAME(nxs_copyrectangle,NXGLIB_SUFFIX) while (rows--) { - NXGL_MEMCPY(dest, sptr, width); + NXGL_MEMCPY((NXGL_PIXEL_T*)dest, (NXGL_PIXEL_T*)sptr, width); dptr += deststride; sptr += srcstride; } diff --git a/nuttx/graphics/nxglib/nxglib_fillrectangle.c b/nuttx/graphics/nxglib/nxglib_fillrectangle.c index 727c57580..b5ed8d581 100644 --- a/nuttx/graphics/nxglib/nxglib_fillrectangle.c +++ b/nuttx/graphics/nxglib/nxglib_fillrectangle.c @@ -82,7 +82,7 @@ ****************************************************************************/ void NXGL_FUNCNAME(nxgl_fillrectangle,NXGLIB_SUFFIX) -(FAR struct fb_planeinfo_s *pinfo, FAR const struct nxgl_rect_s *rect, NXGL_PIXEL_T color) +(FAR struct fb_planeinfo_s *pinfo, FAR const struct nxgl_rect_s *rect, nxgl_mxpixel_t color) { ubyte *line; unsigned int width; @@ -106,7 +106,7 @@ void NXGL_FUNCNAME(nxgl_fillrectangle,NXGLIB_SUFFIX) while (rows--) { - NXGL_MEMSET(line, color, width); + NXGL_MEMSET(line, (NXGL_PIXEL_T)color, width); line += stride; } } diff --git a/nuttx/graphics/nxglib/nxglib_filltrapezoid.c b/nuttx/graphics/nxglib/nxglib_filltrapezoid.c index f1f13a00f..2343a4680 100644 --- a/nuttx/graphics/nxglib/nxglib_filltrapezoid.c +++ b/nuttx/graphics/nxglib/nxglib_filltrapezoid.c @@ -86,7 +86,7 @@ void NXGL_FUNCNAME(nxglib_filltrapezoid,NXGLIB_SUFFIX) (FAR struct fb_videoinfo_s *vinfo, FAR struct fb_planeinfo_s *pinfo, - FAR const struct nxgl_trapezoid_s *trap, NXGL_PIXEL_T color) + FAR const struct nxgl_trapezoid_s *trap, nxgl_mxpixel_t color) { unsigned int stride; ubyte *line; @@ -152,7 +152,7 @@ void NXGL_FUNCNAME(nxglib_filltrapezoid,NXGLIB_SUFFIX) /* Then draw the run from (line + clipx1) to (line + clipx2) */ - NXGL_MEMSET(line + NXGL_SCALEX(ix1), color, ix2 - ix1 + 1); + NXGL_MEMSET(line + NXGL_SCALEX(ix1), (NXGL_PIXEL_T)color, ix2 - ix1 + 1); } /* Move to the start of the next line */ |