diff options
Diffstat (limited to 'firmware/export/font.h')
-rw-r--r-- | firmware/export/font.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/firmware/export/font.h b/firmware/export/font.h index 14a683a5f2..fff7d05c0b 100644 --- a/firmware/export/font.h +++ b/firmware/export/font.h | |||
@@ -72,7 +72,7 @@ enum { | |||
72 | */ | 72 | */ |
73 | 73 | ||
74 | /* loadable font magic and version #*/ | 74 | /* loadable font magic and version #*/ |
75 | #define VERSION "RB11" | 75 | #define VERSION "RB12" |
76 | 76 | ||
77 | typedef unsigned short bitmap_t; /* bitmap image unit size*/ | 77 | typedef unsigned short bitmap_t; /* bitmap image unit size*/ |
78 | 78 | ||
@@ -88,15 +88,14 @@ typedef unsigned short bitmap_t; /* bitmap image unit size*/ | |||
88 | /* builtin C-based proportional/fixed font structure */ | 88 | /* builtin C-based proportional/fixed font structure */ |
89 | /* based on The Microwindows Project http://microwindows.org */ | 89 | /* based on The Microwindows Project http://microwindows.org */ |
90 | struct font { | 90 | struct font { |
91 | char * name; /* font name*/ | ||
92 | int maxwidth; /* max width in pixels*/ | 91 | int maxwidth; /* max width in pixels*/ |
93 | unsigned int height; /* height in pixels*/ | 92 | unsigned int height; /* height in pixels*/ |
94 | int ascent; /* ascent (baseline) height*/ | 93 | int ascent; /* ascent (baseline) height*/ |
95 | int firstchar; /* first character in bitmap*/ | 94 | int firstchar; /* first character in bitmap*/ |
96 | int size; /* font size in glyphs*/ | 95 | int size; /* font size in glyphs*/ |
97 | bitmap_t *bits; /* 16-bit right-padded bitmap data*/ | 96 | const unsigned char *bits; /* 8-bit column bitmap data*/ |
98 | unsigned long *offset; /* offsets into bitmap data*/ | 97 | const unsigned short *offset; /* offsets into bitmap data*/ |
99 | unsigned char *width; /* character widths or NULL if fixed*/ | 98 | const unsigned char *width; /* character widths or NULL if fixed*/ |
100 | int defaultchar; /* default char (not glyph index)*/ | 99 | int defaultchar; /* default char (not glyph index)*/ |
101 | long bits_size; /* # words of bitmap_t bits*/ | 100 | long bits_size; /* # words of bitmap_t bits*/ |
102 | }; | 101 | }; |