diff --git a/graphics/nxbe/nxbe_closewindow.c b/graphics/nxbe/nxbe_closewindow.c index b05bd003761..c5d577e5b9f 100644 --- a/graphics/nxbe/nxbe_closewindow.c +++ b/graphics/nxbe/nxbe_closewindow.c @@ -89,7 +89,7 @@ void nxbe_closewindow(FAR struct nxbe_window_s *wnd) * indicate the modal state. */ - DEBUGASSERT(wnd->above == NULL & NXBE_STATE_ISMODAL(be)); + DEBUGASSERT(wnd->above == NULL && NXBE_STATE_ISMODAL(be)); /* Leave the modal state */ diff --git a/graphics/nxglib/cursor/nxglib_cursor_backup.c b/graphics/nxglib/cursor/nxglib_cursor_backup.c index 322800c0f0a..ce37c5f02ed 100644 --- a/graphics/nxglib/cursor/nxglib_cursor_backup.c +++ b/graphics/nxglib/cursor/nxglib_cursor_backup.c @@ -100,8 +100,8 @@ void NXGL_FUNCNAME(nxglib_cursor_backup, NXGLIB_SUFFIX) { /* Get the width and the height of the images in pixels/rows */ - width = be->cursor.bounds.pt2.x = be->cursor.bounds.pt1.x + 1; - height = be->cursor.bounds.pt2.y = be->cursor.bounds.pt1.y + 1; + width = be->cursor.bounds.pt2.x - be->cursor.bounds.pt1.x + 1; + height = be->cursor.bounds.pt2.y - be->cursor.bounds.pt1.y + 1; /* Get the width of the images in bytes. */ diff --git a/graphics/nxglib/cursor/nxglib_cursor_draw.c b/graphics/nxglib/cursor/nxglib_cursor_draw.c index a64a5998e1d..a5e46189828 100644 --- a/graphics/nxglib/cursor/nxglib_cursor_draw.c +++ b/graphics/nxglib/cursor/nxglib_cursor_draw.c @@ -147,8 +147,8 @@ void NXGL_FUNCNAME(nxglib_cursor_draw, NXGLIB_SUFFIX) { /* Get the width and the height of the images in pixels/rows */ - width = be->cursor.bounds.pt2.x = be->cursor.bounds.pt1.x + 1; - height = be->cursor.bounds.pt2.y = be->cursor.bounds.pt1.y + 1; + width = be->cursor.bounds.pt2.x - be->cursor.bounds.pt1.x + 1; + height = be->cursor.bounds.pt2.y - be->cursor.bounds.pt1.y + 1; /* Get the width of the images in bytes. */ diff --git a/graphics/nxglib/cursor/nxglib_cursor_erase.c b/graphics/nxglib/cursor/nxglib_cursor_erase.c index fc48376d420..5f6ce7b507f 100644 --- a/graphics/nxglib/cursor/nxglib_cursor_erase.c +++ b/graphics/nxglib/cursor/nxglib_cursor_erase.c @@ -99,8 +99,8 @@ void NXGL_FUNCNAME(nxglib_cursor_erase, NXGLIB_SUFFIX) { /* Get the width and the height of the images in pixels/rows */ - width = be->cursor.bounds.pt2.x = be->cursor.bounds.pt1.x + 1; - height = be->cursor.bounds.pt2.y = be->cursor.bounds.pt1.y + 1; + width = be->cursor.bounds.pt2.x - be->cursor.bounds.pt1.x + 1; + height = be->cursor.bounds.pt2.y - be->cursor.bounds.pt1.y + 1; /* Get the width of the images in bytes. */ diff --git a/include/nuttx/nx/nxcursor.h b/include/nuttx/nx/nxcursor.h index 17a006d4609..ef2dede5bfa 100644 --- a/include/nuttx/nx/nxcursor.h +++ b/include/nuttx/nx/nxcursor.h @@ -165,7 +165,7 @@ int nxcursor_enable(NXHANDLE hnd, bool enable); ****************************************************************************/ #if defined(CONFIG_NX_HWCURSORIMAGE) || defined(CONFIG_NX_SWCURSOR) -int nxcursor_setimage(NXHANDLE hnd, FAR struct nx_cursorimage_s *image); +int nxcursor_setimage(NXHANDLE hnd, FAR const struct nx_cursorimage_s *image); #endif /**************************************************************************** diff --git a/libs/libnx/nxmu/nx_cursor.c b/libs/libnx/nxmu/nx_cursor.c index 321ff8f0b16..ed4d61cd4cd 100644 --- a/libs/libnx/nxmu/nx_cursor.c +++ b/libs/libnx/nxmu/nx_cursor.c @@ -119,7 +119,7 @@ int nxcursor_enable(NXHANDLE hnd, bool enable) ****************************************************************************/ #if defined(CONFIG_NX_HWCURSORIMAGE) || defined(CONFIG_NX_SWCURSOR) -int nxcursor_setimage(NXHANDLE hnd, FAR struct nx_cursorimage_s *image) +int nxcursor_setimage(NXHANDLE hnd, FAR const struct nx_cursorimage_s *image) { FAR struct nxmu_conn_s *conn = (FAR struct nxmu_conn_s *)hnd; struct nxsvrmsg_curimage_s outmsg;