diff options
| author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2012-05-05 19:09:42 +0000 |
|---|---|---|
| committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2012-05-05 19:09:42 +0000 |
| commit | 7003f6932efd8a118acbd30fba85e15bd76238dd (patch) | |
| tree | 3fc9c5a8ee2828213249001ff953f2fea78c2391 /amiga/font.c | |
| parent | 2f7061b894af10797003eaa37a3fb8c3aeeaf079 (diff) | |
| download | netsurf-7003f6932efd8a118acbd30fba85e15bd76238dd.tar.gz netsurf-7003f6932efd8a118acbd30fba85e15bd76238dd.tar.bz2 | |
Use font_unicode option as preferred (first scanned) font. Ideally need to
expand this so multiple fonts can be specified. Allow disabling of
scanning other fonts. Add stubs for a scanning progress GUI.
svn path=/trunk/netsurf/; revision=13907
Diffstat (limited to 'amiga/font.c')
| -rw-r--r-- | amiga/font.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/amiga/font.c b/amiga/font.c index d75a2770c..877093b4c 100644 --- a/amiga/font.c +++ b/amiga/font.c @@ -416,8 +416,8 @@ struct OutlineFont *ami_open_outline_font(const plot_font_style_t *fstyle, break; case NSA_UNICODE_FONT: default: - fontname = ami_font_scan_lookup(codepoint, glypharray); -printf("FONT::: %s\n", fontname); + fontname = (char *)ami_font_scan_lookup(codepoint, glypharray); + if(fontname == NULL) return NULL; break; } @@ -784,13 +784,8 @@ ULONG ami_unicode_text(struct RastPort *rp,const char *string,ULONG length,const void ami_init_fonts(void) { - struct MinList *list; - /* Initialise Unicode font scanner */ - list = NewObjList(); - /** TODO: add font_unicode and other preferred fonts to the list here */ - ami_font_scan_init(nsoption_charp(font_unicode_file), list, glypharray); - FreeObjList(list); + ami_font_scan_init(nsoption_charp(font_unicode_file), false, glypharray); /* Initialise font caching etc lists */ ami_font_list = NewObjList(); |