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/graphics | |
| 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/graphics')
| -rw-r--r-- | nuttx/graphics/nxbe/nxbe_clipper.c | 2 | ||||
| -rw-r--r-- | nuttx/graphics/nxglib/nxglib_copyrectangle.c | 10 | ||||
| -rw-r--r-- | nuttx/graphics/nxtk/nxtk_bitmaptoolbar.c | 4 | ||||
| -rw-r--r-- | nuttx/graphics/nxtk/nxtk_bitmapwindow.c | 4 |
4 files changed, 11 insertions, 9 deletions
diff --git a/nuttx/graphics/nxbe/nxbe_clipper.c b/nuttx/graphics/nxbe/nxbe_clipper.c index f0ccff71e..c66f74c7b 100644 --- a/nuttx/graphics/nxbe/nxbe_clipper.c +++ b/nuttx/graphics/nxbe/nxbe_clipper.c @@ -179,7 +179,7 @@ void nxbe_clipper(FAR struct nxbe_window_s *wnd, FAR struct nxbe_clipops_s *cops, FAR struct nxbe_plane_s *plane) { - struct nxbe_clipstack_s stack; + struct nxbe_clipstack_s stack; FAR struct nxbe_window_s *currw; struct nxgl_rect_s rect; struct nxgl_rect_s obscuredrect; diff --git a/nuttx/graphics/nxglib/nxglib_copyrectangle.c b/nuttx/graphics/nxglib/nxglib_copyrectangle.c index 8a13260c6..500b92184 100644 --- a/nuttx/graphics/nxglib/nxglib_copyrectangle.c +++ b/nuttx/graphics/nxglib/nxglib_copyrectangle.c @@ -102,10 +102,12 @@ void NXGL_FUNCNAME(nxgl_copyrectangle,NXGLIB_SUFFIX) deststride = pinfo->stride; - /* Get the dimensions of the rectange to fill: height in rows and width in bytes */ + /* Get the dimensions of the rectange to fill: width in pixels, + * height in rows + */ - width = NXGL_SCALEX(dest->pt2.x - dest->pt1.x + 1); - rows = dest->pt2.y - dest->pt1.y + 1; + width = dest->pt2.x - dest->pt1.x + 1; + rows = dest->pt2.y - dest->pt1.y + 1; #if NXGLIB_BITSPERPIXEL < 8 # ifdef CONFIG_NXGL_PACKEDMSFIRST @@ -168,7 +170,7 @@ void NXGL_FUNCNAME(nxgl_copyrectangle,NXGLIB_SUFFIX) #else /* Copy the whole line */ - NXGL_MEMCPY((NXGL_PIXEL_T*)dest, (NXGL_PIXEL_T*)sline, width); + NXGL_MEMCPY((NXGL_PIXEL_T*)dline, (NXGL_PIXEL_T*)sline, width); #endif dline += deststride; sline += srcstride; diff --git a/nuttx/graphics/nxtk/nxtk_bitmaptoolbar.c b/nuttx/graphics/nxtk/nxtk_bitmaptoolbar.c index dde83d9ef..98b99bb47 100644 --- a/nuttx/graphics/nxtk/nxtk_bitmaptoolbar.c +++ b/nuttx/graphics/nxtk/nxtk_bitmaptoolbar.c @@ -85,8 +85,8 @@ * 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: diff --git a/nuttx/graphics/nxtk/nxtk_bitmapwindow.c b/nuttx/graphics/nxtk/nxtk_bitmapwindow.c index 1410e8c6d..954282eb3 100644 --- a/nuttx/graphics/nxtk/nxtk_bitmapwindow.c +++ b/nuttx/graphics/nxtk/nxtk_bitmapwindow.c @@ -85,8 +85,8 @@ * 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: |