diff options
| author | Nils Wallménius <nils@rockbox.org> | 2007-06-30 17:54:02 +0000 |
|---|---|---|
| committer | Nils Wallménius <nils@rockbox.org> | 2007-06-30 17:54:02 +0000 |
| commit | df155c85778d1294b9e030929bfcd210fd8bc165 (patch) | |
| tree | c777a6723d693817ba0781ef12933783eb29f3f1 /firmware/export/font.h | |
| parent | 6cfb906a0eb07308ef5e2fa610ea2b966343186d (diff) | |
Change unsigned long to uint32_t and long to int32_t to fix a crash in
64 bit sims. Make a couple of private functions 'static'.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13743 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/export/font.h')
| -rw-r--r-- | firmware/export/font.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/firmware/export/font.h b/firmware/export/font.h index 57991a5d50..649a1d080d 100644 --- a/firmware/export/font.h +++ b/firmware/export/font.h @@ -19,6 +19,8 @@ #ifndef _FONT_H #define _FONT_H +#include "inttypes.h" + /* * Incore font and image definitions */ @@ -99,7 +101,7 @@ struct font { const unsigned short *offset; /* offsets into bitmap data*/ const unsigned char *width; /* character widths or NULL if fixed*/ int defaultchar; /* default char (not glyph index)*/ - long bits_size; /* # bytes of glyph bits*/ + int32_t bits_size; /* # bytes of glyph bits*/ }; /* font routines*/ @@ -111,7 +113,6 @@ int font_getstringsize(const unsigned char *str, int *w, int *h, int fontnumber) int font_get_width(struct font* ft, unsigned short ch); const unsigned char * font_get_bits(struct font* ft, unsigned short ch); void glyph_cache_save(void); -void glyph_cache_load(void); #else /* HAVE_LCD_BITMAP */ |