From 5d36aaf249f4f7baf752f3ecc5c252de05cd7166 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Hohensohn?= Date: Thu, 26 Aug 2004 21:15:07 +0000 Subject: New font format (already rotated) saves code, space and time. On the downside this new format is incompatible, so get the new fonts, too. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5015 a1c6a512-1295-4272-9138-f99709370657 --- firmware/export/font.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'firmware/export/font.h') diff --git a/firmware/export/font.h b/firmware/export/font.h index 14a683a..fff7d05 100644 --- a/firmware/export/font.h +++ b/firmware/export/font.h @@ -72,7 +72,7 @@ enum { */ /* loadable font magic and version #*/ -#define VERSION "RB11" +#define VERSION "RB12" typedef unsigned short bitmap_t; /* bitmap image unit size*/ @@ -88,15 +88,14 @@ typedef unsigned short bitmap_t; /* bitmap image unit size*/ /* builtin C-based proportional/fixed font structure */ /* based on The Microwindows Project http://microwindows.org */ struct font { - char * name; /* font name*/ int maxwidth; /* max width in pixels*/ unsigned int height; /* height in pixels*/ int ascent; /* ascent (baseline) height*/ int firstchar; /* first character in bitmap*/ int size; /* font size in glyphs*/ - bitmap_t *bits; /* 16-bit right-padded bitmap data*/ - unsigned long *offset; /* offsets into bitmap data*/ - unsigned char *width; /* character widths or NULL if fixed*/ + const unsigned char *bits; /* 8-bit column bitmap data*/ + 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; /* # words of bitmap_t bits*/ }; -- cgit v1.1