diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-12-04 23:03:33 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-12-04 23:03:33 +0000 |
commit | 6ebc1f9f8b9ebc7f53ef00599e10be30bbb7bdc9 (patch) | |
tree | 9938edc737b494616cd8d16946950fd205c183f2 /nuttx/include | |
parent | ffeebe323d5310bc88b7db0da55a8a97d1d36968 (diff) | |
download | px4-nuttx-6ebc1f9f8b9ebc7f53ef00599e10be30bbb7bdc9.tar.gz px4-nuttx-6ebc1f9f8b9ebc7f53ef00599e10be30bbb7bdc9.tar.bz2 px4-nuttx-6ebc1f9f8b9ebc7f53ef00599e10be30bbb7bdc9.zip |
Integrating font capabilities; debug bitmap logic
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1415 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/include')
-rw-r--r-- | nuttx/include/nuttx/nx.h | 3 | ||||
-rw-r--r-- | nuttx/include/nuttx/nxglib.h | 1 | ||||
-rw-r--r-- | nuttx/include/nuttx/nxtk.h | 14 |
3 files changed, 11 insertions, 7 deletions
diff --git a/nuttx/include/nuttx/nx.h b/nuttx/include/nuttx/nx.h index 79abbdd76..13866f2f5 100644 --- a/nuttx/include/nuttx/nx.h +++ b/nuttx/include/nuttx/nx.h @@ -659,7 +659,8 @@ EXTERN int nx_move(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect, * hwnd - The window that will receive the bitmap image * dest - Describes the rectangular on the display that will receive the * the bit map. - * src - The start of the source image. + * src - The start of the source image. This is an array source + * images of size CONFIG_NX_NPLANES. * origin - The origin of the upper, left-most corner of the full bitmap. * Both dest and origin are in window coordinates, however, origin * may lie outside of the display. diff --git a/nuttx/include/nuttx/nxglib.h b/nuttx/include/nuttx/nxglib.h index 7b9e95f84..34bd0bd10 100644 --- a/nuttx/include/nuttx/nxglib.h +++ b/nuttx/include/nuttx/nxglib.h @@ -43,6 +43,7 @@ #include <nuttx/config.h> #include <sys/types.h> #include <fixedmath.h> +#include <nuttx/fb.h> /**************************************************************************** * Pre-processor definitions diff --git a/nuttx/include/nuttx/nxtk.h b/nuttx/include/nuttx/nxtk.h index 21410f76b..d9466b9dc 100644 --- a/nuttx/include/nuttx/nxtk.h +++ b/nuttx/include/nuttx/nxtk.h @@ -273,10 +273,11 @@ EXTERN int nxtk_movewindow(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect, * hfwnd The client sub0window that will receive the bitmap image * dest - Describes the rectangular region on in the client sub-window * will receive the bit map. - * src - The start of the source image. + * src - The start of the source image(s). This is an array source + * images of size CONFIG_NX_NPLANES. * origin - The origin of the upper, left-most corner of the full bitmap. - * Both dest and origin are in window coordinates, however, origin - * may lie outside of the display. + * Both dest and origin are in sub-window coordinates, however, the + * origin may lie outside of the sub-window display. * stride - The width of the full source image in pixels. * * Return: @@ -286,7 +287,7 @@ EXTERN int nxtk_movewindow(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect, EXTERN int nxtk_bitmapwindow(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *dest, - FAR const void **src, + FAR const void *src[CONFIG_NX_NPLANES], FAR const struct nxgl_point_s *origin, unsigned int stride); @@ -364,6 +365,7 @@ EXTERN int nxtk_filltoolbar(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect EXTERN int nxtk_filltraptoolbar(NXTKWINDOW hfwnd, FAR const struct nxgl_trapezoid_s *trap, nxgl_mxpixel_t color[CONFIG_NX_NPLANES]); + /**************************************************************************** * Name: nxtk_movetoolbar * @@ -399,8 +401,8 @@ EXTERN int nxtk_movetoolbar(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect * will receive the bit map. * src - The start of the source image. * origin - The origin of the upper, left-most corner of the full bitmap. - * Both dest and origin are in window coordinates, however, origin - * may lie outside of the display. + * Both dest and origin are in sub-window coordinates, however, the + * origin may lie outside of the sub-window display. * stride - The width of the full source image in pixels. * * Return: |