devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

fix errors

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27883 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jonathan Gordon 2010-08-25 14:23:31 +00:00
parent faaf431d32
commit 0d040838be
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
apps/gui/skin_engine/skin_fonts.c
View file

@ -60,7 +60,7 @@ void skin_font_init(void)
int skin_font_load(char* font_name, int glyphs) int skin_font_load(char* font_name, int glyphs)
{ {
int i; int i;
int skin_font_size; int skin_font_size = 0;
struct font *pf; struct font *pf;
struct skin_font_info *font = NULL; struct skin_font_info *font = NULL;
char filename[MAX_PATH]; char filename[MAX_PATH];
@ -95,7 +95,9 @@ int skin_font_load(char* font_name, int glyphs)
{ {
if (!glyphs) if (!glyphs)
glyphs = GLYPHS_TO_CACHE; glyphs = GLYPHS_TO_CACHE;
#ifndef __PCTOOL__
skin_font_size = glyphs * get_glyph_size(filename); skin_font_size = glyphs * get_glyph_size(filename);
#endif
if ( !skin_font_size ) if ( !skin_font_size )
{ {
skin_font_size = SKIN_FONT_SIZE; skin_font_size = SKIN_FONT_SIZE;
@ -104,12 +106,12 @@ int skin_font_load(char* font_name, int glyphs)
if (!pf->buffer_start) if (!pf->buffer_start)
return -1; return -1;
font->buffer = pf->buffer_start; font->buffer = pf->buffer_start;
pf->buffer_size = skin_font_size;
} }
else else
{ {
pf->buffer_start = font->buffer; pf->buffer_start = font->buffer;
} }
pf->buffer_size = skin_font_size;
pf->fd = -1; pf->fd = -1;
font->font_id = font_load(pf, filename); font->font_id = font_load(pf, filename);
@ -120,7 +122,6 @@ int skin_font_load(char* font_name, int glyphs)
return font->font_id; return font->font_id;
} }
/* unload a skin font. If a font has been loaded more than once it wont actually /* unload a skin font. If a font has been loaded more than once it wont actually
* be unloaded untill all references have been unloaded */ * be unloaded untill all references have been unloaded */
void skin_font_unload(int font_id) void skin_font_unload(int font_id)