OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Font cache: misc fixes and improvements

This commit is contained in:
Gregory Nutt 2017-01-06 11:06:50 -06:00
parent d7173f2eb5
commit 725ba1602a
4 changed files with 42 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configs/stm3210e-eval/nxterm/defconfig
View File

@ -666,7 +666,7 @@ CONFIG_SIG_SIGWORK=17
# POSIX Message Queue Options
#
CONFIG_PREALLOC_MQ_MSGS=8
CONFIG_MQ_MAXMSGSIZE=32
CONFIG_MQ_MAXMSGSIZE=64
# CONFIG_MODULE is not set
#
@ -999,7 +999,7 @@ CONFIG_NXTERM=y
# NxTerm Output Text/Graphics Options
#
CONFIG_NXTERM_BPP=16
CONFIG_NXTERM_CURSORCHAR=137
CONFIG_NXTERM_CURSORCHAR=95
CONFIG_NXTERM_MXCHARS=256
CONFIG_NXTERM_CACHESIZE=32
CONFIG_NXTERM_LINESEPARATION=0

4
configs/stm3240g-eval/nxterm/defconfig
View File

@ -713,7 +713,7 @@ CONFIG_SIG_SIGWORK=17
# POSIX Message Queue Options
#
CONFIG_PREALLOC_MQ_MSGS=8
CONFIG_MQ_MAXMSGSIZE=32
CONFIG_MQ_MAXMSGSIZE=64
# CONFIG_MODULE is not set
#
@ -1189,7 +1189,7 @@ CONFIG_NXTERM=y
# NxTerm Output Text/Graphics Options
#
CONFIG_NXTERM_BPP=16
CONFIG_NXTERM_CURSORCHAR=137
CONFIG_NXTERM_CURSORCHAR=95
CONFIG_NXTERM_MXCHARS=256
CONFIG_NXTERM_CACHESIZE=32
CONFIG_NXTERM_LINESEPARATION=0

2
graphics/nxterm/nxterm_font.c
View File

@ -65,7 +65,7 @@ static int nxterm_fontsize(FAR struct nxterm_state_s *priv, uint8_t ch,
/* Get the handle of the font managed by the font cache */
hfont = nxf_cache_getfonthandle(priv->fcache);
DEBUGASSERT(hfront != NULL);
DEBUGASSERT(hfont != NULL);
/* Does the character code map to a font? */

71
libnx/nxfonts/nxfonts_cache.c
View File

@ -248,7 +248,7 @@ static inline void nxf_addglyph(FAR struct nxfonts_fcache_s *priv,
priv->tail = glyph;
}
priv->head = glyph
priv->head = glyph;
/* Increment the count of glyphs in the font cache. */
@ -269,7 +269,7 @@ static inline void nxf_addglyph(FAR struct nxfonts_fcache_s *priv,
* is full and the font is not found, then the least-recently-used glyph
* is deleted to make space for the new glyph that will be allocated.
*
* If the glyph is found, then it is moved to the head of the list of
* (2) If the glyph is found, then it is moved to the head of the list of
* glyphs since it is now the most recently used (leaving the least
* recently used glyph at the tail of the list).
*
@ -436,13 +436,28 @@ static inline void nxf_fillglyph(FAR struct nxfonts_fcache_s *priv,
for (row = 0; row < glyph->height; row++)
{
/* Just copy the color value into the glyph memory */
/* Copy the color value into the glyph memory */
for (col = 0; col < glyph->width; col += 3)
col = 0;
for (; ; )
{
*ptr++ = pixel[0];
if (++col >= glyph->width)
{
break;
}
*ptr++ = pixel[1];
if (++col >= glyph->width)
{
break;
}
*ptr++ = pixel[2];
if (++col >= glyph->width)
{
break;
}
}
}
}
@ -653,56 +668,44 @@ FCACHE nxf_cache_connect(enum nx_fontid_e fontid,
* 24).
*/
#ifndef CONFIG_NX_DISABLE_1BPP
if (bpp == 1)
switch (bpp)
{
#ifndef CONFIG_NX_DISABLE_1BPP
case 1:
priv->renderer = (nxf_renderer_t)nxf_convert_1bpp;
}
else
break;
#endif
#ifndef CONFIG_NX_DISABLE_2BPP
if (bpp == 2)
{
case 2:
priv->renderer = (nxf_renderer_t)nxf_convert_2bpp;
}
else
break;
#endif
#ifndef CONFIG_NX_DISABLE_4BPP
if (bpp == 4)
{
case 4:
priv->renderer = (nxf_renderer_t)nxf_convert_4bpp;
}
else
break;
#endif
#ifndef CONFIG_NX_DISABLE_8BPP
if (bpp == 8)
{
case 8:
priv->renderer = (nxf_renderer_t)nxf_convert_8bpp;
}
else
break;
#endif
#ifndef CONFIG_NX_DISABLE_16BPP
if (bpp == 16)
{
case 16:
priv->renderer = (nxf_renderer_t)nxf_convert_16bpp;
}
else
break;
#endif
#ifndef CONFIG_NX_DISABLE_24BPP
if (bpp == 24)
{
case 24:
priv->renderer = (nxf_renderer_t)nxf_convert_24bpp;
}
else
break;
#endif
#ifndef CONFIG_NX_DISABLE_32BPP
if (bpp == 32)
{
case 32:
priv->renderer = (nxf_renderer_t)nxf_convert_32bpp;
}
else
break;
#endif
{
default:
gerr("ERROR: Unsupported pixel depth: %d\n", bpp);
errcode = ENOSYS;
goto errout_with_fcache;
@ -883,7 +886,7 @@ FAR const struct nxfonts_glyph_s *nxf_cache_getglyph(FCACHE fhandle, uint8_t ch)
fbm = nxf_getbitmap(priv->font, ch);
if (fbm)
{
/* Yes.. render the glyph */
/* Yes.. render the glyph for the font */
glyph = nxf_renderglyph(priv, fbm, ch);
}