summaryrefslogtreecommitdiff
path: root/nuttx/graphics/nxmu
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2011-10-25 01:02:49 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2011-10-25 01:02:49 +0000
commit5b0d579d3cd42d64ff748683297657821ab353ab (patch)
tree0d4ba7dd85265e3c39c53fa21e3cc6ffb8e06895 /nuttx/graphics/nxmu
parentd1070dd752bae7f60ca97ef593eafa2249919629 (diff)
downloadpx4-nuttx-5b0d579d3cd42d64ff748683297657821ab353ab.tar.gz
px4-nuttx-5b0d579d3cd42d64ff748683297657821ab353ab.tar.bz2
px4-nuttx-5b0d579d3cd42d64ff748683297657821ab353ab.zip
Fixes from last changes when built with CodeSourcery, STM32, LCD, 16-bit color
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4063 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/graphics/nxmu')
-rw-r--r--nuttx/graphics/nxmu/nx_getrectangle.c17
1 files changed, 5 insertions, 12 deletions
diff --git a/nuttx/graphics/nxmu/nx_getrectangle.c b/nuttx/graphics/nxmu/nx_getrectangle.c
index 19acae44a..85393f7d2 100644
--- a/nuttx/graphics/nxmu/nx_getrectangle.c
+++ b/nuttx/graphics/nxmu/nx_getrectangle.c
@@ -92,9 +92,9 @@
*
****************************************************************************/
-void nx_getrectangle(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
- unsigned int plane, FAR uint8_t *dest,
- unsigned int deststride)
+int nx_getrectangle(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
+ unsigned int plane, FAR uint8_t *dest,
+ unsigned int deststride)
{
FAR struct nxbe_window_s *wnd = (FAR struct nxbe_window_s *)hwnd;
struct nxsvrmsg_getrectangle_s outmsg;
@@ -103,15 +103,8 @@ void nx_getrectangle(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
#ifdef CONFIG_DEBUG
if (!hwnd || !rect || !dest)
{
- errno = EINVAL;
- return ERROR;
- }
-#endif
-
-#ifdef CONFIG_DEBUG
- if (!wnd || !wnd->conn || !rect || !color)
- {
- errno = EINVAL;
+ gvdbg("Invalid parameters\n");
+ set_errno(EINVAL);
return ERROR;
}
#endif