Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-05 07:12:54 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

mm, audio, crypto, graphics: Fix various spacing/alignment issues

Browse Source
This commit is contained in:
Gregory Nutt
2015-10-08 09:10:22 -06:00
parent 78ae661223
commit 06cd5b2fcc
31 changed files with 92 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
graphics/nxglib/fb/nxglib_copyrectangle.c
+3 -3
View File
@@ -79,7 +79,7 @@
*
****************************************************************************/
void NXGL_FUNCNAME(nxgl_copyrectangle,NXGLIB_SUFFIX)
void NXGL_FUNCNAME(nxgl_copyrectangle, NXGLIB_SUFFIX)
(FAR struct fb_planeinfo_s *pinfo, FAR const struct nxgl_rect_s *dest,
FAR const void *src, FAR const struct nxgl_point_s *origin,
unsigned int srcstride)
@@ -131,7 +131,7 @@ void NXGL_FUNCNAME(nxgl_copyrectangle,NXGLIB_SUFFIX)
/* Then copy the image */
sline = (const uint8_t*)src + NXGL_SCALEX(dest->pt1.x - origin->x) + (dest->pt1.y - origin->y) * srcstride;
sline = (FAR const uint8_t *)src + NXGL_SCALEX(dest->pt1.x - origin->x) + (dest->pt1.y - origin->y) * srcstride;
dline = pinfo->fbmem + dest->pt1.y * deststride + NXGL_SCALEX(dest->pt1.x);
while (rows--)
@@ -171,7 +171,7 @@ void NXGL_FUNCNAME(nxgl_copyrectangle,NXGLIB_SUFFIX)
#else
/* Copy the whole line */
NXGL_MEMCPY((NXGL_PIXEL_T*)dline, (NXGL_PIXEL_T*)sline, width);
NXGL_MEMCPY((NXGL_PIXEL_T *)dline, (NXGL_PIXEL_T *)sline, width);
#endif
dline += deststride;
sline += srcstride;
graphics/nxglib/fb/nxglib_fillrectangle.c
+1 -1
View File
@@ -82,7 +82,7 @@
*
****************************************************************************/
void NXGL_FUNCNAME(nxgl_fillrectangle,NXGLIB_SUFFIX)
void NXGL_FUNCNAME(nxgl_fillrectangle, NXGLIB_SUFFIX)
(FAR struct fb_planeinfo_s *pinfo,
FAR const struct nxgl_rect_s *rect,
NXGL_PIXEL_T color)
graphics/nxglib/fb/nxglib_filltrapezoid.c
+1 -1
View File
@@ -70,7 +70,7 @@
*
****************************************************************************/
void NXGL_FUNCNAME(nxgl_filltrapezoid,NXGLIB_SUFFIX)(
void NXGL_FUNCNAME(nxgl_filltrapezoid, NXGLIB_SUFFIX)(
FAR struct fb_planeinfo_s *pinfo,
FAR const struct nxgl_trapezoid_s *trap,
FAR const struct nxgl_rect_s *bounds,
graphics/nxglib/fb/nxglib_getrectangle.c
+1 -1
View File
@@ -127,7 +127,7 @@ static inline void nxgl_lowresmemcpy(FAR uint8_t *dline, FAR const uint8_t *slin
*
****************************************************************************/
void NXGL_FUNCNAME(nxgl_getrectangle,NXGLIB_SUFFIX)
void NXGL_FUNCNAME(nxgl_getrectangle, NXGLIB_SUFFIX)
(FAR struct fb_planeinfo_s *pinfo, FAR const struct nxgl_rect_s *rect,
FAR void *dest, unsigned int deststride)
{
graphics/nxglib/fb/nxglib_setpixel.c
+1 -1
View File
@@ -84,7 +84,7 @@
*
****************************************************************************/
void NXGL_FUNCNAME(nxgl_setpixel,NXGLIB_SUFFIX)
void NXGL_FUNCNAME(nxgl_setpixel, NXGLIB_SUFFIX)
(FAR struct fb_planeinfo_s *pinfo,
FAR const struct nxgl_point_s *pos,
NXGL_PIXEL_T color)
graphics/nxglib/lcd/nxglib_copyrectangle.c
+3 -3
View File
@@ -81,7 +81,7 @@
*
****************************************************************************/
void NXGL_FUNCNAME(nxgl_copyrectangle,NXGLIB_SUFFIX)
void NXGL_FUNCNAME(nxgl_copyrectangle, NXGLIB_SUFFIX)
(FAR struct lcd_planeinfo_s *pinfo, FAR const struct nxgl_rect_s *dest,
FAR const void *src, FAR const struct nxgl_point_s *origin,
unsigned int srcstride)
@@ -103,7 +103,7 @@ void NXGL_FUNCNAME(nxgl_copyrectangle,NXGLIB_SUFFIX)
/* Set up to copy the image */
xoffset = dest->pt1.x - origin->x;
sline = (const uint8_t*)src + NXGL_SCALEX(xoffset) + (dest->pt1.y - origin->y) * srcstride;
sline = (FAR const uint8_t *)src + NXGL_SCALEX(xoffset) + (dest->pt1.y - origin->y) * srcstride;
#if NXGLIB_BITSPERPIXEL < 8
remainder = NXGL_REMAINDERX(xoffset);
#endif
@@ -119,7 +119,7 @@ void NXGL_FUNCNAME(nxgl_copyrectangle,NXGLIB_SUFFIX)
if (remainder != 0)
{
NXGL_FUNCNAME(nxgl_copyrun,NXGLIB_SUFFIX)(sline, pinfo->buffer, remainder, ncols);
NXGL_FUNCNAME(nxgl_copyrun, NXGLIB_SUFFIX)(sline, pinfo->buffer, remainder, ncols);
(void)pinfo->putrun(row, dest->pt1.x, pinfo->buffer, ncols);
}
else
graphics/nxglib/lcd/nxglib_fillrectangle.c
+2 -2
View File
@@ -84,7 +84,7 @@
*
****************************************************************************/
void NXGL_FUNCNAME(nxgl_fillrectangle,NXGLIB_SUFFIX)
void NXGL_FUNCNAME(nxgl_fillrectangle, NXGLIB_SUFFIX)
(FAR struct lcd_planeinfo_s *pinfo,
FAR const struct nxgl_rect_s *rect,
NXGL_PIXEL_T color)
@@ -98,7 +98,7 @@ void NXGL_FUNCNAME(nxgl_fillrectangle,NXGLIB_SUFFIX)
/* Fill the run buffer with the selected color */
NXGL_FUNCNAME(nxgl_fillrun,NXGLIB_SUFFIX)((NXGLIB_RUNTYPE*)pinfo->buffer, color, ncols);
NXGL_FUNCNAME(nxgl_fillrun, NXGLIB_SUFFIX)((NXGLIB_RUNTYPE *)pinfo->buffer, color, ncols);
/* Then fill the rectangle line-by-line */
graphics/nxglib/lcd/nxglib_filltrapezoid.c
+2 -2
View File
@@ -86,7 +86,7 @@
*
****************************************************************************/
void NXGL_FUNCNAME(nxgl_filltrapezoid,NXGLIB_SUFFIX)
void NXGL_FUNCNAME(nxgl_filltrapezoid, NXGLIB_SUFFIX)
(FAR struct lcd_planeinfo_s *pinfo,
FAR const struct nxgl_trapezoid_s *trap,
FAR const struct nxgl_rect_s *bounds,
@@ -215,7 +215,7 @@ void NXGL_FUNCNAME(nxgl_filltrapezoid,NXGLIB_SUFFIX)
ncols = botw;
}
NXGL_FUNCNAME(nxgl_fillrun,NXGLIB_SUFFIX)((NXGLIB_RUNTYPE*)pinfo->buffer, color, ncols);
NXGL_FUNCNAME(nxgl_fillrun, NXGLIB_SUFFIX)((NXGLIB_RUNTYPE *)pinfo->buffer, color, ncols);
/* Then fill the trapezoid row-by-row */
graphics/nxglib/lcd/nxglib_getrectangle.c
+1 -1
View File
@@ -79,7 +79,7 @@
*
****************************************************************************/
void NXGL_FUNCNAME(nxgl_getrectangle,NXGLIB_SUFFIX)
void NXGL_FUNCNAME(nxgl_getrectangle, NXGLIB_SUFFIX)
(FAR struct lcd_planeinfo_s *pinfo, FAR const struct nxgl_rect_s *rect,
FAR void *dest, unsigned int deststride)
{
graphics/nxglib/lcd/nxglib_moverectangle.c
+1 -1
View File
@@ -81,7 +81,7 @@
*
****************************************************************************/
void NXGL_FUNCNAME(nxgl_moverectangle,NXGLIB_SUFFIX)
void NXGL_FUNCNAME(nxgl_moverectangle, NXGLIB_SUFFIX)
(FAR struct lcd_planeinfo_s *pinfo, FAR const struct nxgl_rect_s *rect,
FAR struct nxgl_point_s *offset)
{
graphics/nxglib/lcd/nxglib_setpixel.c
+1 -1
View File
@@ -85,7 +85,7 @@
*
****************************************************************************/
void NXGL_FUNCNAME(nxgl_setpixel,NXGLIB_SUFFIX)
void NXGL_FUNCNAME(nxgl_setpixel, NXGLIB_SUFFIX)
(FAR struct lcd_planeinfo_s *pinfo,
FAR const struct nxgl_point_s *pos,
NXGL_PIXEL_T color)