diff options
Diffstat (limited to 'apps/gui')
-rw-r--r-- | apps/gui/skin_engine/skin_parser.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c index ad10689107..c4a96d0e9b 100644 --- a/apps/gui/skin_engine/skin_parser.c +++ b/apps/gui/skin_engine/skin_parser.c | |||
@@ -78,7 +78,6 @@ | |||
78 | 78 | ||
79 | #define WPS_ERROR_INVALID_PARAM -1 | 79 | #define WPS_ERROR_INVALID_PARAM -1 |
80 | 80 | ||
81 | #define GLYPHS_TO_CACHE 256 | ||
82 | static char* skin_buffer = NULL; | 81 | static char* skin_buffer = NULL; |
83 | void skinparser_set_buffer(char* pointer) | 82 | void skinparser_set_buffer(char* pointer) |
84 | { | 83 | { |
@@ -468,7 +467,7 @@ static int parse_font_load(struct skin_element *element, | |||
468 | if(element->params_count > 2) | 467 | if(element->params_count > 2) |
469 | glyphs = get_param(element, 2)->data.number; | 468 | glyphs = get_param(element, 2)->data.number; |
470 | else | 469 | else |
471 | glyphs = GLYPHS_TO_CACHE; | 470 | glyphs = global_settings.glyphs; |
472 | if (id < 2) | 471 | if (id < 2) |
473 | { | 472 | { |
474 | DEBUGF("font id must be >= 2\n"); | 473 | DEBUGF("font id must be >= 2\n"); |
@@ -1742,8 +1741,7 @@ static bool skin_load_fonts(struct wps_data *data) | |||
1742 | char path[MAX_PATH]; | 1741 | char path[MAX_PATH]; |
1743 | snprintf(path, sizeof path, FONT_DIR "/%s", font->name); | 1742 | snprintf(path, sizeof path, FONT_DIR "/%s", font->name); |
1744 | #ifndef __PCTOOL__ | 1743 | #ifndef __PCTOOL__ |
1745 | font->id = font_load_ex(path, | 1744 | font->id = font_load_ex(path, 0, skinfonts[font_id-2].glyphs); |
1746 | font_glyphs_to_bufsize(path, skinfonts[font_id-2].glyphs)); | ||
1747 | 1745 | ||
1748 | #else | 1746 | #else |
1749 | font->id = font_load(path); | 1747 | font->id = font_load(path); |