sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Font cache in libnx needs to use context-specific memory allocators.

Browse Source
This commit is contained in:
Gregory Nutt 2017-01-06 07:06:51 -06:00
parent dc05af6436
commit a0199be503
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libnx/nxfonts/nxfonts_cache.c
View File

@ -45,7 +45,6 @@
#include <errno.h> #include <errno.h>
#include <debug.h> #include <debug.h>
#include <nuttx/kmalloc.h>
#include <nuttx/nx/nxfonts.h> #include <nuttx/nx/nxfonts.h>
/**************************************************************************** /****************************************************************************
@ -98,7 +97,7 @@ static void nxf_freeglyph(FAR struct nxfonts_glyph_s *glyph)
{ {
if (glyph->bitmap) if (glyph->bitmap)
{ {
kmm_free(glyph->bitmap); lib_free(glyph->bitmap);
} }
memset(glyph, 0, sizeof(struct nxfonts_glyph_s)); memset(glyph, 0, sizeof(struct nxfonts_glyph_s));
@ -241,7 +240,7 @@ nxf_renderglyph(FAR struct nxfonts_fcache_s *priv,
/* Allocate memory to hold the glyph with its offsets */ /* Allocate memory to hold the glyph with its offsets */
bmsize = glyph->stride * glyph->height; bmsize = glyph->stride * glyph->height;
glyph->bitmap = (FAR uint8_t *)kmm_malloc(bmsize); glyph->bitmap = (FAR uint8_t *)lib_malloc(bmsize);
if (glyph->bitmap) if (glyph->bitmap)
{ {
@ -402,7 +401,7 @@ FCACHE nxf_cache_connect(enum nx_fontid_e fontid,
/* Allocate memory for the (empty) font cache */ /* Allocate memory for the (empty) font cache */
priv = (FAR struct nxfonts_fcache_s *) priv = (FAR struct nxfonts_fcache_s *)
kmm_malloc(sizeof( struct nxfonts_fcache_s)); lib_zalloc(sizeof( struct nxfonts_fcache_s));
if (priv == NULL) if (priv == NULL)
{ {
@ -494,7 +493,7 @@ FCACHE nxf_cache_connect(enum nx_fontid_e fontid,
return (FCACHE)priv; return (FCACHE)priv;
errout_with_fcache: errout_with_fcache:
kmm_free(priv); lib_free(priv);
errout: errout:
set_errno(errcode); set_errno(errcode);
return NULL; return NULL;
@ -546,7 +545,7 @@ void nxf_cache_disconnect(FCACHE fcache)
FAR struct nxfonts_glyph_s *glyph = &priv->glyph[i]; FAR struct nxfonts_glyph_s *glyph = &priv->glyph[i];
if (glyph->bitmap) if (glyph->bitmap)
{ {
kmm_free(glyph->bitmap); lib_free(glyph->bitmap);
} }
} }
@ -556,7 +555,7 @@ void nxf_cache_disconnect(FCACHE fcache)
/* Finally, free the font cache stucture itself */ /* Finally, free the font cache stucture itself */
kmm_free(fcache); lib_free(fcache);
} }
else else
{ {