diff options
| author | kyle.hu.gz <[email protected]> | 2010-02-04 21:35:19 +0000 |
|---|---|---|
| committer | kyle.hu.gz <[email protected]> | 2010-02-04 21:35:19 +0000 |
| commit | d5b20ba603ae674e1f2f34226b555b0d8702a6bf (patch) | |
| tree | 59106071db57153ae4e1a50a44ad2083c57814d3 | |
| parent | 8d78b3743a1012456064c172d9b238c99061959d (diff) | |
Removed the const definition in hz12 font file info which causes hard fault when loading.
Also uploaded a working SongTi 12x12 font file.
Tested in stm32_radio.
git-svn-id: https://rt-thread.googlecode.com/svn/trunk@374 bbd45198-f89e-11dd-88c7-29a3b14d5316
| -rw-r--r-- | bsp/stm32_radio/resource/hzk12.fnt | bin | 196272 -> 196272 bytes | |||
| -rw-r--r-- | rtgui/common/hz12font.c | 4 |
2 files changed, 2 insertions, 2 deletions
diff --git a/bsp/stm32_radio/resource/hzk12.fnt b/bsp/stm32_radio/resource/hzk12.fnt Binary files differindex 877acf27cf..8f580a83e4 100644 --- a/bsp/stm32_radio/resource/hzk12.fnt +++ b/bsp/stm32_radio/resource/hzk12.fnt diff --git a/rtgui/common/hz12font.c b/rtgui/common/hz12font.c index 5ea8bf57ac..6ebcf7ef82 100644 --- a/rtgui/common/hz12font.c +++ b/rtgui/common/hz12font.c @@ -12293,12 +12293,12 @@ struct rtgui_font rtgui_font_hz12 = /* size = 196272 bytes */ #else -const struct rtgui_hz_file_font hz12 = +struct rtgui_hz_file_font hz12 = { {RT_NULL}, /* cache root */ 0, /* cache size */ 12, /* font size */ - 32, /* font data size */ + 24, /* font data size */ -1, /* fd */ "/resource/hzk12.fnt" /* font_fn */ }; |