diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-10-25 15:21:01 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-10-25 15:21:01 +0000 |
| commit | 38c2a5225455acca57f72649460b4a5d12d61ca1 (patch) | |
| tree | cbdee96ca1d85812ee55fdb2b0df94bf54e89ada /nuttx/graphics | |
| parent | 5b0d579d3cd42d64ff748683297657821ab353ab (diff) | |
| download | px4-nuttx-38c2a5225455acca57f72649460b4a5d12d61ca1.tar.gz px4-nuttx-38c2a5225455acca57f72649460b4a5d12d61ca1.tar.bz2 px4-nuttx-38c2a5225455acca57f72649460b4a5d12d61ca1.zip | |
Fix some errors in 8-bit color conversion macros; Fix tools/incdir.sh when g++ is used; Fix bad cast that caused problems with the background window is released
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4064 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/graphics')
| -rw-r--r-- | nuttx/graphics/nxmu/nx_releasebkgd.c | 2 | ||||
| -rw-r--r-- | nuttx/graphics/nxsu/nx_releasebkgd.c | 13 |
2 files changed, 7 insertions, 8 deletions
diff --git a/nuttx/graphics/nxmu/nx_releasebkgd.c b/nuttx/graphics/nxmu/nx_releasebkgd.c index 1326e951e..4e8a75679 100644 --- a/nuttx/graphics/nxmu/nx_releasebkgd.c +++ b/nuttx/graphics/nxmu/nx_releasebkgd.c @@ -2,7 +2,7 @@ * graphics/nxmu/nx_releasebkgd.c * * Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/nuttx/graphics/nxsu/nx_releasebkgd.c b/nuttx/graphics/nxsu/nx_releasebkgd.c index a19b85ac4..b0cbbf5c1 100644 --- a/nuttx/graphics/nxsu/nx_releasebkgd.c +++ b/nuttx/graphics/nxsu/nx_releasebkgd.c @@ -2,7 +2,7 @@ * graphics/nxsu/nx_releasebkgd.c * * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -86,11 +86,10 @@ int nx_releasebkgd(NXWINDOW hwnd) { - FAR struct nxfe_state_s *fe = (FAR struct nxfe_state_s *)hwnd; - FAR struct nxbe_state_s *be = &fe->be; + FAR struct nxbe_window_s *bkgd = (FAR struct nxbe_window_s *)hwnd; #ifdef CONFIG_DEBUG - if (!fe) + if (!bkgd) { errno = EINVAL; return ERROR; @@ -99,12 +98,12 @@ int nx_releasebkgd(NXWINDOW hwnd) /* Restore the NX background window callbacks */ - be->bkgd.cb = &g_bkgdcb; - be->bkgd.arg = NULL; + bkgd->cb = &g_bkgdcb; + bkgd->arg = NULL; /* Redraw the background window */ - nxfe_redrawreq(&be->bkgd, &be->bkgd.bounds); + nxfe_redrawreq(bkgd, &bkgd->bounds); return OK; } |